Commit 17a3102cde35991964c7d8dbeddadb1cf3a0504a
Exists in
master
Fixed merge stuffs
Showing 13 changed files Side-by-side Diff
- TestCases.tex
- screen_sequence_diagrams/add_class.dot
- screen_sequence_diagrams/blank_out_words.dot
- screen_sequence_diagrams/change_password.dot
- screen_sequence_diagrams/configure_account_notifications.dot
- screen_sequence_diagrams/contact_admin.dot
- screen_sequence_diagrams/drop_class.dot
- screen_sequence_diagrams/edit_flashcard.dot
- screen_sequence_diagrams/filter_cards.dot
- screen_sequence_diagrams/fix_flashcard.dot
- screen_sequence_diagrams/flag_inappropriate_cards.dot
- screen_sequence_diagrams/hide_card.dot
- use_cases_diagram.dot
TestCases.tex
View file @
17a3102
... | ... | @@ -781,7 +781,7 @@ |
781 | 781 | \item |
782 | 782 | {UserX has flashcard added to their deck.} |
783 | 783 | \item |
784 | - {The Flashcard is shown in the Live Feed.} | |
784 | + {The Flashcard is shown in the live feed.} | |
785 | 785 | \item |
786 | 786 | {UserY and other users can add this flashcard to their decks.} |
787 | 787 | \end{itemize} |
... | ... | @@ -810,7 +810,11 @@ |
810 | 810 | {The flashcard shall be included in the UserX's deck.(c.f. Note about simultaneous browser session).} |
811 | 811 | \end{enumerate} |
812 | 812 | |
813 | -\item[Expected Result:] {UserX will have the new flashcard in their deck. For UserX, the new flashcard will have a checkmark, indicating that the card is in their deck and a pencil picture on top right to indicate UserX as the author of the flashcard. The new flashcard will show up on UserY's live feed on class TEST 101 without checkmark and pencil mark.} | |
813 | +\item[Expected Result:] {UserX will have the new flashcard in their deck. | |
814 | +For UserX, the new flashcard will have a checkmark, indicating that the card | |
815 | +is in their deck and a pencil icon on top right to indicate UserX as | |
816 | +the author of the flashcard. The new flashcard will show up on UserY's | |
817 | +live feed on class TEST 101 without checkmark and pencil icon.} | |
814 | 818 | |
815 | 819 | \item[Alternative Workflow:] |
816 | 820 | \begin{enumerate} |
... | ... | @@ -827,7 +831,7 @@ |
827 | 831 | \item |
828 | 832 | {UserX shall click the ``Contribute'' button in the modal.} |
829 | 833 | \item |
830 | - {The System shall add the new flashcard containing the text ``The rain in \textbf{Spain} stays mainly in the \textbf{plain}'' to the feed of each user enrolled in TEST 1.} | |
834 | + {The System shall add the new flashcard containing the text ``The rain in \textbf{Spain} stays mainly in the \textbf{plain}'' to the feed of each user enrolled in TEST.} | |
831 | 835 | \item |
832 | 836 | {UserY shall view the live feed and within a minute see the new flashcard appear with ``Spain'' and ``plain'' bolded.} |
833 | 837 | \end{enumerate} |
... | ... | @@ -838,8 +842,7 @@ |
838 | 842 | indicating that the card is in their deck and a pencil icon on |
839 | 843 | top right to indicate UserX as the author of the flashcard. |
840 | 844 | The new flashcard will show up on UserY's live feed on class TEST 101 |
841 | -without checkmark and pencil icon. | |
842 | -} | |
845 | +without checkmark and pencil icon.} | |
843 | 846 | |
844 | 847 | \item[Alternative Workflow:] |
845 | 848 | \begin{enumerate} |
... | ... | @@ -851,8 +854,7 @@ |
851 | 854 | {UserX shall click the ``Contribute'' button in the dialog.} |
852 | 855 | \end{enumerate} |
853 | 856 | |
854 | -\item[Expected Result:] | |
855 | -{ Blank flashcard will not be added to UserX's deck or to the live feed of TEST 101.} | |
857 | +\item[Expected Result:] {Blank flashcard will not be added to UserX's deck or to the live feed of TEST 101.} | |
856 | 858 | |
857 | 859 | \item[Alternative Workflow:] |
858 | 860 | \begin{enumerate} |
... | ... | @@ -881,8 +883,7 @@ |
881 | 883 | \item[Desired Outcome:]{Flashcard is edited and saved appropriately} |
882 | 884 | \\ |
883 | 885 | |
884 | -\item[User Goals:]{The User shall be able to change the text, the blanked | |
885 | -words, and the study date on a flashcard.} | |
886 | +\item[User Goals:]{The User shall be able to change the text and the blanked words on a flashcard.} | |
886 | 887 | |
887 | 888 | \item[Dependency Use Cases:]{[A1] User Registration, [A2] User |
888 | 889 | Login, [A3] Add a Class, [F1] Push Flashcard, [F3] Pull Flashcard} |
889 | 890 | |
890 | 891 | |
891 | 892 | |
892 | 893 | |
893 | 894 | |
894 | 895 | |
... | ... | @@ -895,29 +896,34 @@ |
895 | 896 | \begin{itemize} |
896 | 897 | \itemsep1pt\parskip0pt\parsep0pt |
897 | 898 | \item |
898 | - {UserX is logged in} | |
899 | + {The User is logged in as UserX.} | |
899 | 900 | \item |
901 | + {The User is logged in a different browser session as UserY.} | |
902 | +\item | |
900 | 903 | {User has added the class TEST 101.} |
901 | 904 | \item |
902 | - {UserX has the flashcard \textbf{Change} me in their flashcard.} | |
905 | + {TEST 101 contains the flashcard ``This is made for \textbf{edit}'' | |
906 | +, which was made by other user and is not in UserX's deck.} | |
907 | +\item | |
908 | + {UserX has the flashcard ``I have made an error'', which was created by UserX, in their deck.} | |
903 | 909 | \end{itemize} |
904 | 910 | |
905 | 911 | \item[Postconditions:] |
906 | 912 | \begin{itemize} |
907 | 913 | \itemsep1pt\parskip0pt\parsep0pt |
908 | 914 | \item |
909 | - {Flashcard is edited} | |
915 | + {The selected flashcard is edited} | |
910 | 916 | \end{itemize} |
911 | 917 | |
912 | -\item[Trigger:]{The User wants to edit their card.} | |
918 | +\item[Trigger:]{The User wants to edit a card.} | |
913 | 919 | |
914 | 920 | \item[Workflow:] |
915 | 921 | \begin{enumerate} |
916 | 922 | \itemsep1pt\parskip0pt\parsep0pt |
917 | 923 | \item |
918 | - {UserX shall move the cursor over the flashcard ``this is made for edit''.} | |
924 | + {UserX shall hover the cursor over the flashcard ``this is made for \textbf{edit}''.} | |
919 | 925 | \item |
920 | - {UserX shall click the edit button on bottom left of the selected flashcard.} | |
926 | + {UserX shall click the edit button on bottom left of the hovered flashcard. The blue edit button looks like a pencil slanted writing on a paper.} | |
921 | 927 | \item |
922 | 928 | {The System shall present a modal that contains the text of the selected flashcard.} |
923 | 929 | \item |
... | ... | @@ -925,7 +931,7 @@ |
925 | 931 | \item |
926 | 932 | {UserX shall click 'Save'} |
927 | 933 | \item |
928 | - {The System shall hide the model from UserX.} | |
934 | + {The System shall hide the modal from UserX.} | |
929 | 935 | \end{enumerate} |
930 | 936 | |
931 | 937 | \item[Expected Results:]{The selected flashcard's text shall be changed to ``Edit has been made''.} |
... | ... | @@ -981,8 +987,7 @@ |
981 | 987 | \item[Description:]{This test case outlines the presentation layering step |
982 | 988 | process of a user pulling a flashcard.} |
983 | 989 | |
984 | -\item[Desired Outcome:]{The User shall have the flashcard added to their own | |
985 | -deck.} | |
990 | +\item[Desired Outcome:]{The User shall have the flashcard added to their deck.} | |
986 | 991 | \\ |
987 | 992 | |
988 | 993 | \item[User Goals:]{The User will be able to review that flashcard.} |
989 | 994 | |
990 | 995 | |
991 | 996 | |
... | ... | @@ -998,22 +1003,22 @@ |
998 | 1003 | \begin{itemize} |
999 | 1004 | \itemsep1pt\parskip0pt\parsep0pt |
1000 | 1005 | \item |
1006 | + {The User is logged in as UserX.} | |
1007 | +\item | |
1001 | 1008 | {User has registered for class TEST 101.} |
1002 | 1009 | \item |
1003 | 1010 | {User is at live feed for TEST 101.} |
1004 | 1011 | \item |
1005 | - {Flashcard with text ``TESTY FLASHY'' has been created.} | |
1006 | -\item | |
1007 | - {That flashcard with the text ``TESTY FLASHY'' is in the Live Feed of class TEST 101.} | |
1012 | + {That flashcard with the text ``Pull me'' is in the Live Feed of class TEST 101.} | |
1008 | 1013 | \end{itemize} |
1009 | 1014 | |
1010 | 1015 | \item[Postconditions:] |
1011 | 1016 | \begin{itemize} |
1012 | 1017 | \itemsep1pt\parskip0pt\parsep0pt |
1013 | 1018 | \item |
1014 | - {User shall have that flashcard with the text ``TESTY FLASHY'' added to their deck} | |
1019 | + {UserX shall have that flashcard with the text ``Pull me'' added to their deck} | |
1015 | 1020 | \item |
1016 | - {User can review this flashcard later} | |
1021 | + {UserX shall be able to review this flashcard later} | |
1017 | 1022 | \end{itemize} |
1018 | 1023 | |
1019 | 1024 | \item[Trigger:]{UserX wants to add a flashcard to their deck to study it.} |
1020 | 1025 | |
1021 | 1026 | |
1022 | 1027 | |
1023 | 1028 | |
... | ... | @@ -1023,22 +1028,26 @@ |
1023 | 1028 | \begin{enumerate} |
1024 | 1029 | \itemsep1pt\parskip0pt\parsep0pt |
1025 | 1030 | \item |
1026 | - {UserX shall choose the flashcard with the text ``TESTY FLASHY'' from the | |
1031 | + {UserX shall choose the flashcard with the text ``Pull me'' from the | |
1027 | 1032 | class TEST 101 feed and hover their cursor over it.} |
1028 | 1033 | \item |
1029 | 1034 | {The System shall present buttons on mouseover.} |
1030 | 1035 | \item |
1031 | - {UserX shall click on the large plus that appears over the flashcard with the text ``TESTY FLASHY''.} | |
1036 | + {UserX shall click on the large plus that appears over the flashcard with the text ``Pull me''.} | |
1032 | 1037 | \item |
1033 | - {The System shall hide the flashcard with the text ``TESTY FLASHY'' from the class | |
1034 | -TEST 101 feed for UserX.} | |
1038 | + {The System shall add the flashcard into UserX's deck. | |
1039 | + A checkmark shall appear on top right corner of the flashcard.} | |
1035 | 1040 | \item |
1036 | - {UserX shall check that card with the text ``TESTY FLASHY'' has been added to | |
1037 | -their class TEST 101 deck by checking API.} | |
1041 | + {UserX shall click the ``Deck'' icon on the top left to enter their | |
1042 | +deck.} | |
1043 | +\item | |
1044 | + {UserX shall check that the card with the text ``Pull me'' has been added to their class | |
1045 | +TEST 101 deck.} | |
1038 | 1046 | \end{enumerate} |
1039 | 1047 | |
1040 | -\item[Expected Result:] {The flashcard with the text ``TESTY FLASHY'' is in the class | |
1041 | -TEST 101 deck.} | |
1048 | +\item[Expected Result:] {The flashcard with the text ``Pull me'' is in the class | |
1049 | +TEST 101 deck. If UserX hovers the cursor over the flashcard at the live feed of | |
1050 | +TEST 101, the original placement of the large plus button has been changed to large minus button.} | |
1042 | 1051 | \end{description} |
1043 | 1052 | \newpage |
1044 | 1053 |
screen_sequence_diagrams/add_class.dot
View file @
17a3102
... | ... | @@ -6,7 +6,7 @@ |
6 | 6 | nodesep=1.4; |
7 | 7 | labelloc="t"; |
8 | 8 | label = "[A3] Add a Class"; |
9 | - "Sidebar Menu"[center=true, fillcolor="#aaaaff", style=filled,pos="0,0!"]; | |
9 | + "Navigation Menu"[center=true, fillcolor="#aaaaff", style=filled,pos="0,0!"]; | |
10 | 10 | "Controller"[center=true, fillcolor="#aaaaff", style=filled, shape=diamond, |
11 | 11 | fixedsize=true, width=1.4, height=1.4]; |
12 | 12 | "POST /api/sections/{pk}/enroll"[shape=none]; |
13 | 13 | |
14 | 14 | |
... | ... | @@ -21,16 +21,16 @@ |
21 | 21 | "Controller"[center=true, fillcolor="#aaaaff", style=filled, shape=diamond, |
22 | 22 | fixedsize=true, width=1.4, height=1.4]; |
23 | 23 | "WhiteListCheck"[center=true, fillcolor="#aaaaff", style=filled, style=filled]; |
24 | - "Sidebar Menu" -> "POST /api/sections/{pk}/enroll"[dir=none]; | |
24 | + "Navigation Menu" -> "POST /api/sections/{pk}/enroll"[dir=none]; | |
25 | 25 | "POST /api/sections/{pk}/enroll" -> "Controller"; |
26 | - "Controller" -> "FAILURE"[dir=none]; | |
27 | - "FAILURE" -> "Sidebar Menu"; | |
28 | - "Controller" -> "SUCCESS"[dir=none]; | |
26 | + "Controller" -> "FAILURE"; | |
27 | + "FAILURE" -> "Navigation Menu"; | |
28 | + "Controller" -> "SUCCESS"; | |
29 | 29 | "SUCCESS"->"WhiteListCheck"; |
30 | - "WhiteListCheck" -> "Permission Denied: \n User cannot be enrolled in class"[dir=none]; | |
31 | - "WhiteListCheck" -> "Success! \n User is added to class"[dir=none]; | |
32 | - "Success! \n User is added to class" -> "Sidebar Menu"; | |
33 | - "Permission Denied: \n User cannot be enrolled in class" -> "Sidebar Menu"; | |
30 | + "WhiteListCheck" -> "Permission Denied: \n User cannot be enrolled in class"; | |
31 | + "WhiteListCheck" -> "Success! \n User is added to class"; | |
32 | + "Success! \n User is added to class" -> "Navigation Menu"; | |
33 | + "Permission Denied: \n User cannot be enrolled in class" -> "Navigation Menu"; | |
34 | 34 | |
35 | 35 | } |
screen_sequence_diagrams/blank_out_words.dot
View file @
17a3102
... | ... | @@ -13,13 +13,13 @@ |
13 | 13 | |
14 | 14 | "View Deck" -> "Flashcard"; |
15 | 15 | "Flashcard" -> "Edit Flashcard Page"; |
16 | - "Edit Flashcard Page" -> "POST /api/flashcards/{pk}"[dir=none]; | |
16 | + "Edit Flashcard Page" -> "POST /api/flashcards/{pk}"; | |
17 | 17 | "POST /api/flashcards/{pk}" -> "Controller"; |
18 | 18 | |
19 | 19 | //Only blanks(mask) altered |
20 | 20 | "Only mask altered"[shape=none]; |
21 | 21 | "Server Updates FlashcardMask object"[fillcolor="#aaaaff", style=filled,pos="0,0!"]; |
22 | - "Controller" -> "Only mask altered"[dir=none]; | |
22 | + "Controller" -> "Only mask altered"; | |
23 | 23 | "Only mask altered" -> "Server Updates FlashcardMask object"; |
24 | 24 | "Server Updates FlashcardMask object" -> "View Deck"; |
25 | 25 |
screen_sequence_diagrams/change_password.dot
View file @
17a3102
... | ... | @@ -6,7 +6,7 @@ |
6 | 6 | nodesep=1.4; |
7 | 7 | labelloc="t"; |
8 | 8 | label="[A5] Change password & [A6] Reset password"; |
9 | - "Sidebar Menu"[center=true, fillcolor="#aaaaff", style=filled,pos="0,0!"]; | |
9 | + "Navigation Menu/Settings"[center=true, fillcolor="#aaaaff", style=filled,pos="0,0!"]; | |
10 | 10 | "Controller"[center=true, fillcolor="#aaaaff", style=filled, shape = diamond]; |
11 | 11 | "POST /api/request_password_reset"[shape=none]; |
12 | 12 | labelfloat=true; |
13 | 13 | |
14 | 14 | |
... | ... | @@ -14,14 +14,14 @@ |
14 | 14 | |
15 | 15 | "Controller"[center=true, fillcolor="#aaaaff", style=filled, shape = diamond, |
16 | 16 | fixedsize=true, width=1.4, height=1.4]; |
17 | - "Sidebar Menu/Settings" -> "POST /api/request_password_reset"[dir=none]; | |
17 | + "Navigation Menu/Settings" -> "POST /api/request_password_reset"[dir=none]; | |
18 | 18 | "POST /api/request_password_reset" -> "Controller"; |
19 | 19 | "Controller" -> "Email"; |
20 | 20 | "Failure: User did not\nchange password"[shape=none]; |
21 | - "Email" -> "Failure: User did not\nchange password"[dir=none]; | |
22 | - "Failure: User did not\nchange password" -> "Sidebar Menu"; | |
21 | + "Email" -> "Failure: User did not\nchange password"; | |
22 | + "Failure: User did not\nchange password" -> "Navigation Menu"; | |
23 | 23 | "Success: User \nchanged password"[shape=none]; |
24 | - "Email" -> "Success: User \nchanged password"[dir=none]; | |
25 | - "Success: User \nchanged password" -> "Sidebar Menu"; | |
24 | + "Email" -> "Success: User \nchanged password"; | |
25 | + "Success: User \nchanged password" -> "Navigation Menu"; | |
26 | 26 | } |
screen_sequence_diagrams/configure_account_notifications.dot
View file @
17a3102
... | ... | @@ -8,11 +8,11 @@ |
8 | 8 | nodesep=2.5; |
9 | 9 | ranksep=0.45; |
10 | 10 | "Account Settings"[center=true, fillcolor="#aaaaff", style=filled,pos="0,0!"]; |
11 | - "Account Settings" -> "PATCH /api/me/settings"[dir=none]; | |
11 | + "Account Settings" -> "PATCH /api/me/settings"; | |
12 | 12 | |
13 | 13 | "views.update_settings" -> "New settings valid?"; |
14 | - "New settings valid?" -> "Yes\nSUCCESS"[dir=none]; | |
15 | - "New settings valid?" -> "No\nFAILURE"[dir=none]; | |
14 | + "New settings valid?" -> "Yes\nSUCCESS"; | |
15 | + "New settings valid?" -> "No\nFAILURE"; | |
16 | 16 | "PATCH /api/me/settings" -> "views.update_settings"; |
17 | 17 | "No\nFAILURE" -> "Account Settings"; |
18 | 18 | "Yes\nSUCCESS" -> "Save settings"; |
screen_sequence_diagrams/contact_admin.dot
View file @
17a3102
... | ... | @@ -16,9 +16,9 @@ |
16 | 16 | lp=100; |
17 | 17 | |
18 | 18 | // Graph |
19 | - "Instructor's Email Client" -> "EMAIL"[dir=none]; | |
19 | + "Instructor's Email Client" -> "EMAIL"; | |
20 | 20 | "EMAIL" -> "Admin's Message Box"; |
21 | - "Admin's Message Box" -> "MESSAGE"[dir=none]; | |
21 | + "Admin's Message Box" -> "MESSAGE"; | |
22 | 22 | "MESSAGE" -> "Instructor's Email Client"; |
23 | 23 | } |
screen_sequence_diagrams/drop_class.dot
View file @
17a3102
... | ... | @@ -6,7 +6,7 @@ |
6 | 6 | nodesep=1.4; |
7 | 7 | labelloc="t"; |
8 | 8 | label="[A4] Drop a class"; |
9 | - "Sidebar Menu"[center=true, fillcolor="#aaaaff", style=filled,pos="0,0!"]; | |
9 | + "Navigation Menu/Settings"[center=true, fillcolor="#aaaaff", style=filled,pos="0,0!"]; | |
10 | 10 | "Controller"[center=true, fillcolor="#aaaaff", style=filled, shape=diamond, |
11 | 11 | fixedsize=true, width=1.4, height=1.4]; |
12 | 12 | "User Check"[center=true, fillcolor="#aaaaff", style=filled]; |
13 | 13 | |
14 | 14 | |
... | ... | @@ -16,14 +16,14 @@ |
16 | 16 | "Controller"[center=true, fillcolor="#aaaaff", style=filled, shape=diamond, |
17 | 17 | fixedsize=true, width=1.4, height=1.4]; |
18 | 18 | "POST /api/sections/{pk}/drop"[shape=none]; |
19 | - "Sidebar Menu" -> "POST /api/sections/{pk}/drop"[dir=none]; | |
19 | + "Navigation Menu/Settings" -> "POST /api/sections/{pk}/drop"; | |
20 | 20 | "POST /api/sections/{pk}/drop" -> "Controller"; |
21 | 21 | "Controller" -> "User Check"; |
22 | 22 | "User did not\ndrop class"[shape=none]; |
23 | - "User Check" -> "User did not\ndrop class"[dir=none]; | |
24 | - "User did not\ndrop class" -> "Sidebar Menu"; | |
23 | + "User Check" -> "User did not\ndrop class"; | |
24 | + "User did not\ndrop class" -> "Navigation Menu/Settings"; | |
25 | 25 | "User successfully\ndropped class"[shape=none]; |
26 | - "User Check" -> "User successfully\ndropped class"[dir=none]; | |
27 | - "User successfully\ndropped class" -> "Sidebar Menu"; | |
26 | + "User Check" -> "User successfully\ndropped class"; | |
27 | + "User successfully\ndropped class" -> "Navigation Menu/Settings"; | |
28 | 28 | } |
screen_sequence_diagrams/edit_flashcard.dot
View file @
17a3102
... | ... | @@ -13,19 +13,19 @@ |
13 | 13 | |
14 | 14 | "View Deck" -> "Edit Flashcard Button"; |
15 | 15 | "Edit Flashcard Button" -> "Flashcard Changes"; |
16 | - "Flashcard Changes" -> "POST /api/flashcards/{pk}"[dir=none]; | |
16 | + "Flashcard Changes" -> "POST /api/flashcards/{pk}"; | |
17 | 17 | "POST /api/flashcards/{pk}" -> "Controller"; |
18 | 18 | |
19 | 19 | //Only blanks(mask) altered |
20 | 20 | "Only mask altered"[shape=none]; |
21 | 21 | "Server creates New FlashcardMask object"[fillcolor="#aaaaff", style=filled,pos="0,0!"]; |
22 | - "Controller" -> "Only mask altered"[dir=none]; | |
22 | + "Controller" -> "Only mask altered"; | |
23 | 23 | "Only mask altered" -> "Server creates New FlashcardMask object"; |
24 | 24 | "Server creates New FlashcardMask object" -> "View Deck"; |
25 | 25 | |
26 | 26 | //Text changed |
27 | 27 | "Text or material date altered"[shape=none]; |
28 | - "Controller" -> "Text or material date altered"[dir=none]; | |
28 | + "Controller" -> "Text or material date altered"; | |
29 | 29 | "Text or material date altered" -> "Create New Flashcard"; |
30 | 30 | "Create New Flashcard" -> "Push to Feed"; |
31 | 31 | "Push to Feed"-> "Add to User Deck"; |
screen_sequence_diagrams/filter_cards.dot
View file @
17a3102
... | ... | @@ -16,9 +16,9 @@ |
16 | 16 | "Controller"[center=true, fillcolor="#aaaaff", style=filled, shape = diamond, |
17 | 17 | fixedsize=true, width=1.4, height=1.4]; |
18 | 18 | |
19 | - "Feed" -> "Filter"[dir=none]; | |
19 | + "Feed" -> "Filter"; | |
20 | 20 | "Filter" -> "Controller"; |
21 | - "Controller" -> "Filtered cards"[dir=none]; | |
21 | + "Controller" -> "Filtered cards"; | |
22 | 22 | "Filtered cards" -> "Feed"; |
23 | 23 | |
24 | 24 | } |
screen_sequence_diagrams/fix_flashcard.dot
View file @
17a3102
... | ... | @@ -9,10 +9,10 @@ |
9 | 9 | ranksep=0.1; |
10 | 10 | "View Deck"[center=true, fillcolor="#aaaaff", style=filled,pos="0,0!"]; |
11 | 11 | "View Deck" -> "Edit Flashcard"; |
12 | - "Edit Flashcard" -> "POST /api/flashcard/{pk}/edit"[dir=none]; | |
12 | + "Edit Flashcard" -> "POST /api/flashcard/{pk}/edit"; | |
13 | 13 | "POST /api/flashcard/{pk}/edit" -> "FlashcardViewSet.edit"; |
14 | - "FlashcardViewSet.edit" -> "Text or material date altered"[dir=none]; | |
15 | - "FlashcardViewSet.edit" -> "Only mask altered"[dir=none]; | |
14 | + "FlashcardViewSet.edit" -> "Text or material date altered"; | |
15 | + "FlashcardViewSet.edit" -> "Only mask altered"; | |
16 | 16 | "Only mask altered" -> "Update UserFlashcard object"; |
17 | 17 | "Text or material date altered" -> "Create new Flashcard with prev pointer\nNotify all users who've pulled the card"; |
18 | 18 | "Only mask altered"[shape=none]; |
19 | 19 | |
20 | 20 | |
21 | 21 | |
... | ... | @@ -23,21 +23,21 @@ |
23 | 23 | labelfloat=true; |
24 | 24 | lp=100; |
25 | 25 | "FlashcardViewSet.edit"[center=true, fillcolor="#aaaaff", style=filled, shape = diamond, fixedsize=true, width=2.2, height=2.2]; |
26 | - "Sidebar Menu"[center=true, fillcolor="#aaaaff", style=filled,pos="0,0!"]; | |
26 | + "Navigation Menu"[center=true, fillcolor="#aaaaff", style=filled,pos="0,0!"]; | |
27 | 27 | "WhiteListCheck"[center=true, fillcolor="#aaaaff", style=filled, style=filled]; |
28 | 28 | "Controller"[center=true, fillcolor="#aaaaff", style=filled, shape = diamond, fixedsize=true, width=1.1, height=1.1]; |
29 | 29 | "POST"[shape=none]; |
30 | 30 | "FAILURE"[shape=none]; |
31 | 31 | "SUCCESS"[shape=none]; |
32 | - "Sidebar Menu" -> "POST"[dir=none]; | |
32 | + "Navigation Menu" -> "POST"; | |
33 | 33 | "POST" -> "Controller"; |
34 | - "Controller" -> "FAILURE"[dir=none]; | |
35 | - "FAILURE" -> "Sidebar Menu"; | |
36 | - "Controller" -> "SUCCESS"[dir=none]; | |
34 | + "Controller" -> "FAILURE"; | |
35 | + "FAILURE" -> "Navigation Menu"; | |
36 | + "Controller" -> "SUCCESS"; | |
37 | 37 | "SUCCESS"->"WhiteListCheck"; |
38 | 38 | "WhiteListCheck" -> "Permission Denied: \n User cannot be enrolled in class"; |
39 | 39 | "WhiteListCheck" -> "Success! \n User is added to class"; |
40 | - "Success! \n User is added to class" -> "Sidebar Menu"; | |
41 | - "Permission Denied: \n User cannot be enrolled in class" -> "Sidebar Menu"; | |
40 | + "Success! \n User is added to class" -> "Navigation Menu"; | |
41 | + "Permission Denied: \n User cannot be enrolled in class" -> "Navigation Menu"; | |
42 | 42 | } |
screen_sequence_diagrams/flag_inappropriate_cards.dot
View file @
17a3102
... | ... | @@ -24,13 +24,13 @@ |
24 | 24 | "Flashcard Hidden from Feed"[center=true, fillcolor="#aaaaff", style=filled]; |
25 | 25 | "POST /api/flashcards/{pk]/report"[shape=none]; |
26 | 26 | "Live Feed" -> "Flag as Inappropriate"; |
27 | - "Flag as Inappropriate" -> "POST /api/flashcards/{pk]/report"[dir=none]; | |
27 | + "Flag as Inappropriate" -> "POST /api/flashcards/{pk]/report"; | |
28 | 28 | "POST /api/flashcards/{pk]/report" -> "Controller"; |
29 | - "Controller" -> "FAILURE"[dir=none]; | |
29 | + "Controller" -> "FAILURE"; | |
30 | 30 | "FAILURE" -> "Live Feed"; |
31 | - "Controller" -> "POST /api/flashcards/{pk]/report"[dir=none]; | |
31 | + "Controller" -> "POST /api/flashcards/{pk]/report"; | |
32 | 32 | "POST /api/flashcards/{pk]/report" -> "Server"; |
33 | - "Server"-> "SUCCESS"[dir=none]; | |
33 | + "Server"-> "SUCCESS"; | |
34 | 34 | "SUCCESS" -> "Flashcard Hidden from Feed"; |
35 | 35 | "Flashcard Hidden from Feed" -> "Server creates a FlashcardReport object"; |
36 | 36 | "Server creates a FlashcardReport object" -> "Live Feed"; |
screen_sequence_diagrams/hide_card.dot
View file @
17a3102
... | ... | @@ -17,10 +17,10 @@ |
17 | 17 | |
18 | 18 | "Controller"[center=true, fillcolor="#aaaaff", style=filled, shape = diamond, |
19 | 19 | fixedsize=true, width=1.4, height=1.4]; |
20 | - "Feed" -> "POST"[dir=none]; | |
20 | + "Feed" -> "POST"; | |
21 | 21 | "POST" -> "Controller"; |
22 | - "Controller" -> "FAILURE: card no longer\nexists in database"[dir=none]; | |
23 | - "Controller" -> "SUCCESS: card\nsuccessfully hidden"[dir=none]; | |
22 | + "Controller" -> "FAILURE: card no longer\nexists in database"; | |
23 | + "Controller" -> "SUCCESS: card\nsuccessfully hidden"; | |
24 | 24 | "FAILURE: card no longer\nexists in database" -> "Feed"; |
25 | 25 | "SUCCESS: card\nsuccessfully hidden" -> "Feed"; |
26 | 26 | } |
use_cases_diagram.dot
View file @
17a3102
1 | 1 | digraph G{ |
2 | - ratio=0.75; | |
2 | + ratio=0.7; | |
3 | 3 | rankdir="LR"; |
4 | 4 | node[shape=box]; |
5 | + nodesep=1.1; | |
5 | 6 | // Styling: |
6 | 7 | // Accounts |
7 | 8 | "[A1] User Registration"[fillcolor="#9ce3ff", style=filled]; |
... | ... | @@ -33,7 +34,7 @@ |
33 | 34 | "[R1] Study Deck"[fillcolor="#ffeeaa", style=filled]; |
34 | 35 | |
35 | 36 | // User |
36 | - "User" [shape=none, shapefile="stick.png" style=none]; | |
37 | + [shape=none, shapefile="stick.png"]; | |
37 | 38 | |
38 | 39 | //Graph |
39 | 40 | "User"->"[A1] User Registration"; |
40 | 41 | |
41 | 42 | |
42 | 43 | |
43 | 44 | |
44 | 45 | |
... | ... | @@ -46,19 +47,20 @@ |
46 | 47 | "[A3] Add a Class"->"[F9] View Class Feed"; |
47 | 48 | "[A3] Add a Class"->"[A4] Drop a Class" |
48 | 49 | "[A8] User Logout"->"[A2] User Login"; |
49 | - "[A9] Contact Admin" | |
50 | + "[A9] Contact Admin"; | |
50 | 51 | |
51 | - "[F1] Push Flashcard"->"[F6] Blank Out Words" | |
52 | - "[F6] Blank Out Words"->"[F9] View Class Feed"; | |
52 | + "[F1] Push Flashcard"->"[F6] Blank Out Words"; | |
53 | 53 | "[F8] Hide Cards"->"[F4] Flag Inappropriate Cards"; |
54 | - "[F9] View Class Feed"->"[F1] Push Flashcard"; | |
55 | - "[F9] View Class Feed"->"[F3] Pull Flashcard"; | |
56 | 54 | "[F9] View Class Feed" ->"[R1] Study Deck"; |
57 | 55 | "[F9] View Class Feed"->"[D2] View Deck"; |
58 | - "[F9] View Class Feed"->"[F8] Hide Cards"; | |
59 | - "[F9] View Class Feed"->"[F7] Fix Flashcard"; | |
56 | + "[F9] View Class Feed"->"[F1] Push Flashcard"; | |
57 | + "[F9] View Class Feed"->"[F2] Edit Card"; | |
58 | + "[F9] View Class Feed"->"[F3] Pull Flashcard"; | |
60 | 59 | "[F9] View Class Feed"->"[F5] Filter Flashcards"; |
60 | + "[F9] View Class Feed"->"[F7] Fix Flashcard"; | |
61 | + "[F9] View Class Feed"->"[F8] Hide Cards"; | |
61 | 62 | |
62 | 63 | "[D2] View Deck"->"[D1] Remove Card from Deck"; |
64 | + "[D2] View Deck"->"[F2] Edit Card"; | |
63 | 65 | } |