From 2165212bc735886ec76be51eccd0b2aafd685d2d Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Fri, 17 Feb 2017 17:45:00 +0100 Subject: Added checking if fields are empty when creating or editing events, added more diagrams, updated use cases, fixed unit test project. --- EventMaker/Design/AddEventFDUC.txt | 3 +- EventMaker/Design/DeleteEventFDUC.txt | 13 - EventMaker/Design/Design.modelproj | 40 +- EventMaker/Design/DesignClassDiagram.classdiagram | 1151 ++++++++++++++++++++ .../Design/DesignClassDiagram.classdiagram.layout | 224 ++++ EventMaker/Design/DomainModel.classdiagram | 123 +++ EventMaker/Design/DomainModel.classdiagram.layout | 78 ++ EventMaker/Design/EditEventFDUC.txt | 3 +- EventMaker/Design/ModelDefinition/Design.uml | 601 +++++++++- .../Design/ModelDefinition/Package1_1602.uml | 558 ++++++++++ .../Design/ModelDefinition/Package2_1602.uml | 239 ++++ .../Design/ModelDefinition/Package3_1602.uml | 426 ++++++++ EventMaker/Design/ModelDefinition/Package_1602.uml | 396 +++++++ EventMaker/Design/ModelDefinition/Package_1603.uml | 132 +++ EventMaker/Design/RemoveEventFDUC.txt | 13 + EventMaker/Design/TestCases.txt | 4 + EventMaker/Design/UMLUseCaseDiagram.usecasediagram | 114 -- .../Design/UMLUseCaseDiagram.usecasediagram.layout | 61 -- EventMaker/Design/UseCaseDiagram.usecasediagram | 106 ++ .../Design/UseCaseDiagram.usecasediagram.layout | 51 + EventMaker/EventMaker/EventMaker.csproj | 7 - .../EventMaker/Model/EventCatalogSingleton.cs | 12 +- EventMaker/EventMaker/View/CreateEventPage.xaml | 4 +- EventMaker/EventMaker/View/CreateEventPage.xaml.cs | 30 +- EventMaker/EventMaker/View/EditEventPage.xaml | 2 +- EventMaker/EventMaker/View/EditEventPage.xaml.cs | 30 +- EventMaker/EventMaker/View/EventItem.xaml | 13 - EventMaker/EventMaker/View/EventItem.xaml.cs | 27 - EventMaker/EventMaker/View/EventPage.xaml | 2 +- EventMaker/EventMaker/ViewModel/EventViewModel.cs | 21 +- .../UnitTests/Assets/LockScreenLogo.scale-200.png | Bin 1430 -> 0 bytes .../UnitTests/Assets/SplashScreen.scale-200.png | Bin 7700 -> 0 bytes .../Assets/Square150x150Logo.scale-200.png | Bin 2937 -> 0 bytes .../UnitTests/Assets/Square44x44Logo.scale-200.png | Bin 1647 -> 0 bytes ...are44x44Logo.targetsize-24_altform-unplated.png | Bin 1255 -> 0 bytes EventMaker/UnitTests/Assets/StoreLogo.png | Bin 1451 -> 0 bytes .../UnitTests/Assets/Wide310x150Logo.scale-200.png | Bin 3204 -> 0 bytes EventMaker/UnitTests/UnitTest.cs | 6 +- EventMaker/UnitTests/UnitTests.csproj | 26 +- EventMaker/UnitTests/project.json | 2 +- 40 files changed, 4223 insertions(+), 295 deletions(-) delete mode 100644 EventMaker/Design/DeleteEventFDUC.txt create mode 100644 EventMaker/Design/DesignClassDiagram.classdiagram create mode 100644 EventMaker/Design/DesignClassDiagram.classdiagram.layout create mode 100644 EventMaker/Design/DomainModel.classdiagram create mode 100644 EventMaker/Design/DomainModel.classdiagram.layout create mode 100644 EventMaker/Design/ModelDefinition/Package1_1602.uml create mode 100644 EventMaker/Design/ModelDefinition/Package2_1602.uml create mode 100644 EventMaker/Design/ModelDefinition/Package3_1602.uml create mode 100644 EventMaker/Design/ModelDefinition/Package_1602.uml create mode 100644 EventMaker/Design/ModelDefinition/Package_1603.uml create mode 100644 EventMaker/Design/RemoveEventFDUC.txt create mode 100644 EventMaker/Design/TestCases.txt delete mode 100644 EventMaker/Design/UMLUseCaseDiagram.usecasediagram delete mode 100644 EventMaker/Design/UMLUseCaseDiagram.usecasediagram.layout create mode 100644 EventMaker/Design/UseCaseDiagram.usecasediagram create mode 100644 EventMaker/Design/UseCaseDiagram.usecasediagram.layout delete mode 100644 EventMaker/EventMaker/View/EventItem.xaml delete mode 100644 EventMaker/EventMaker/View/EventItem.xaml.cs delete mode 100644 EventMaker/UnitTests/Assets/LockScreenLogo.scale-200.png delete mode 100644 EventMaker/UnitTests/Assets/SplashScreen.scale-200.png delete mode 100644 EventMaker/UnitTests/Assets/Square150x150Logo.scale-200.png delete mode 100644 EventMaker/UnitTests/Assets/Square44x44Logo.scale-200.png delete mode 100644 EventMaker/UnitTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png delete mode 100644 EventMaker/UnitTests/Assets/StoreLogo.png delete mode 100644 EventMaker/UnitTests/Assets/Wide310x150Logo.scale-200.png diff --git a/EventMaker/Design/AddEventFDUC.txt b/EventMaker/Design/AddEventFDUC.txt index 370e19f..f91da65 100644 --- a/EventMaker/Design/AddEventFDUC.txt +++ b/EventMaker/Design/AddEventFDUC.txt @@ -8,7 +8,8 @@ Success Guarantee: New event on the list Main Success Scenario: User opens app, presses add button, fills all fields on the page for creating new event and saves the event. Extensions: A. User opens app, presses add button but then he changes mind and presses the back button to return to the main page. -B. The name of event can't be longer than 20 characters. +B. If user tries to add event with empty field show him error message and don't add the event. +C. The name of event can't be longer than 20 characters. Special Requirements: UWP app, serialization to JSON Technology and Data Variations List: None Frequency of Occurence: Based on the will of the user diff --git a/EventMaker/Design/DeleteEventFDUC.txt b/EventMaker/Design/DeleteEventFDUC.txt deleted file mode 100644 index 14bcab4..0000000 --- a/EventMaker/Design/DeleteEventFDUC.txt +++ /dev/null @@ -1,13 +0,0 @@ -Use case name: Delete event -Scope: EventMaker -Level: Deleting event from the list -Primary Actor: User -Stakeholders and Interests: Teachers, deleting events functionality -Preconditions: App started successfuly, there is at least one event on the list -Success Guarantee: Deleted event not present on the list -Main Success Scenario: User opens app and presses delete button on the chosen event. -Extensions: None -Special Requirements: UWP app, serialization to JSON -Technology and Data Variations List: None -Frequency of Occurence: Based on the will of the user -Miscellaneous: None \ No newline at end of file diff --git a/EventMaker/Design/Design.modelproj b/EventMaker/Design/Design.modelproj index 64eab82..11baef0 100644 --- a/EventMaker/Design/Design.modelproj +++ b/EventMaker/Design/Design.modelproj @@ -25,12 +25,41 @@ Content - + Content + + Content + + + Content + DesignClassDiagram.classdiagram + + + Content + + + Content + DomainModel.classdiagram + Content + + Content + + + Content + + + Content + + + Content + + + Content + Content @@ -38,12 +67,15 @@ Content System.sequencediagram - + + Content + + Content - + Content - UMLUseCaseDiagram.usecasediagram + UseCaseDiagram.usecasediagram diff --git a/EventMaker/Design/DesignClassDiagram.classdiagram b/EventMaker/Design/DesignClassDiagram.classdiagram new file mode 100644 index 0000000..266b2af --- /dev/null +++ b/EventMaker/Design/DesignClassDiagram.classdiagram @@ -0,0 +1,1151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + Command + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EventMaker/Design/DesignClassDiagram.classdiagram.layout b/EventMaker/Design/DesignClassDiagram.classdiagram.layout new file mode 100644 index 0000000..8960d0f --- /dev/null +++ b/EventMaker/Design/DesignClassDiagram.classdiagram.layout @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EventMaker/Design/DomainModel.classdiagram b/EventMaker/Design/DomainModel.classdiagram new file mode 100644 index 0000000..906ce11 --- /dev/null +++ b/EventMaker/Design/DomainModel.classdiagram @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + starts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EventMaker/Design/DomainModel.classdiagram.layout b/EventMaker/Design/DomainModel.classdiagram.layout new file mode 100644 index 0000000..b730ef4 --- /dev/null +++ b/EventMaker/Design/DomainModel.classdiagram.layout @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EventMaker/Design/EditEventFDUC.txt b/EventMaker/Design/EditEventFDUC.txt index 19428eb..daa5441 100644 --- a/EventMaker/Design/EditEventFDUC.txt +++ b/EventMaker/Design/EditEventFDUC.txt @@ -8,7 +8,8 @@ Success Guarantee: Previously created event's information changed Main Success Scenario: User opens app, presses edit button on the chosen event, changes information on the edit page and saves the event. Extensions: A. User opens app, presses edit button on the chosen event but then he changes mind and presses the back button to return to the main page. -B. The name of event can't be longer than 20 characters. +B. If user tries to save event with empty field show him error message and don't update the event. +C. The name of event can't be longer than 20 characters. Special Requirements: UWP app, serialization to JSON Technology and Data Variations List: None Frequency of Occurence: Based on the will of the user diff --git a/EventMaker/Design/ModelDefinition/Design.uml b/EventMaker/Design/ModelDefinition/Design.uml index d42f541..1632783 100644 --- a/EventMaker/Design/ModelDefinition/Design.uml +++ b/EventMaker/Design/ModelDefinition/Design.uml @@ -1,5 +1,5 @@  - @@ -17,28 +17,617 @@ name="StandardProfileL3" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + starts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/EventMaker/Design/ModelDefinition/Package1_1602.uml b/EventMaker/Design/ModelDefinition/Package1_1602.uml new file mode 100644 index 0000000..7aa0135 --- /dev/null +++ b/EventMaker/Design/ModelDefinition/Package1_1602.uml @@ -0,0 +1,558 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EventMaker/Design/ModelDefinition/Package2_1602.uml b/EventMaker/Design/ModelDefinition/Package2_1602.uml new file mode 100644 index 0000000..a9d7ad0 --- /dev/null +++ b/EventMaker/Design/ModelDefinition/Package2_1602.uml @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EventMaker/Design/ModelDefinition/Package3_1602.uml b/EventMaker/Design/ModelDefinition/Package3_1602.uml new file mode 100644 index 0000000..e4664ab --- /dev/null +++ b/EventMaker/Design/ModelDefinition/Package3_1602.uml @@ -0,0 +1,426 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EventMaker/Design/ModelDefinition/Package_1602.uml b/EventMaker/Design/ModelDefinition/Package_1602.uml new file mode 100644 index 0000000..60d4e52 --- /dev/null +++ b/EventMaker/Design/ModelDefinition/Package_1602.uml @@ -0,0 +1,396 @@ + + + + + + + + + Command + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EventMaker/Design/ModelDefinition/Package_1603.uml b/EventMaker/Design/ModelDefinition/Package_1603.uml new file mode 100644 index 0000000..bf1e3ef --- /dev/null +++ b/EventMaker/Design/ModelDefinition/Package_1603.uml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EventMaker/Design/RemoveEventFDUC.txt b/EventMaker/Design/RemoveEventFDUC.txt new file mode 100644 index 0000000..6a00ab0 --- /dev/null +++ b/EventMaker/Design/RemoveEventFDUC.txt @@ -0,0 +1,13 @@ +Use case name: Remove event +Scope: EventMaker +Level: Remove event from the list +Primary Actor: User +Stakeholders and Interests: Teachers, removing events functionality +Preconditions: App started successfuly, there is at least one event on the list +Success Guarantee: Removed event not present on the list +Main Success Scenario: User opens app and presses remove button on the chosen event. +Extensions: None +Special Requirements: UWP app, serialization to JSON +Technology and Data Variations List: None +Frequency of Occurence: Based on the will of the user +Miscellaneous: None \ No newline at end of file diff --git a/EventMaker/Design/TestCases.txt b/EventMaker/Design/TestCases.txt new file mode 100644 index 0000000..4a7f3a9 --- /dev/null +++ b/EventMaker/Design/TestCases.txt @@ -0,0 +1,4 @@ +Test Scenario: Adding event with empty property +Tests Steps: User opens app, presses add button, gets taken to the page for creating events, tries to add event without filling one or more fields. +Expected Result: User is being prevented from adding the event. +Actual Result: User successfully adds the event with some empty properties. \ No newline at end of file diff --git a/EventMaker/Design/UMLUseCaseDiagram.usecasediagram b/EventMaker/Design/UMLUseCaseDiagram.usecasediagram deleted file mode 100644 index b31b724..0000000 --- a/EventMaker/Design/UMLUseCaseDiagram.usecasediagram +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - Add event: -User opens app, presses add button, fills all fields and saves event. - - - - Remove event: -User opens app and presses delete button on the chosen event. - - - - Edit event: -User opens app, presses edit button on the chosen event, changes information and saves. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/EventMaker/Design/UMLUseCaseDiagram.usecasediagram.layout b/EventMaker/Design/UMLUseCaseDiagram.usecasediagram.layout deleted file mode 100644 index 5077712..0000000 --- a/EventMaker/Design/UMLUseCaseDiagram.usecasediagram.layout +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/EventMaker/Design/UseCaseDiagram.usecasediagram b/EventMaker/Design/UseCaseDiagram.usecasediagram new file mode 100644 index 0000000..f2f8cbd --- /dev/null +++ b/EventMaker/Design/UseCaseDiagram.usecasediagram @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EventMaker/Design/UseCaseDiagram.usecasediagram.layout b/EventMaker/Design/UseCaseDiagram.usecasediagram.layout new file mode 100644 index 0000000..2ff49b7 --- /dev/null +++ b/EventMaker/Design/UseCaseDiagram.usecasediagram.layout @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EventMaker/EventMaker/EventMaker.csproj b/EventMaker/EventMaker/EventMaker.csproj index 7972536..cd8ab4e 100644 --- a/EventMaker/EventMaker/EventMaker.csproj +++ b/EventMaker/EventMaker/EventMaker.csproj @@ -107,9 +107,6 @@ EditEventPage.xaml - - EventItem.xaml - EventPage.xaml @@ -144,10 +141,6 @@ Designer MSBuild:Compile - - Designer - MSBuild:Compile - Designer MSBuild:Compile diff --git a/EventMaker/EventMaker/Model/EventCatalogSingleton.cs b/EventMaker/EventMaker/Model/EventCatalogSingleton.cs index 9c8713b..cf40fd0 100644 --- a/EventMaker/EventMaker/Model/EventCatalogSingleton.cs +++ b/EventMaker/EventMaker/Model/EventCatalogSingleton.cs @@ -1,14 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Linq.Expressions; +using System.Collections.ObjectModel; namespace EventMaker.Model { public class EventCatalogSingleton { private static EventCatalogSingleton _instance; + public ObservableCollection Events { get; set; } private EventCatalogSingleton() { @@ -30,7 +27,7 @@ namespace EventMaker.Model Events.Add(newEvent); Persistency.PersistencyService.SaveEventsAsJsonAsync(Events); } - public async void LoadEventsAsync() + private async void LoadEventsAsync() { Events = await Persistency.PersistencyService.LoadEventsFromJsonAsync() ?? new ObservableCollection(); } @@ -141,8 +138,5 @@ namespace EventMaker.Model } } - - - public ObservableCollection Events { get; set; } } } diff --git a/EventMaker/EventMaker/View/CreateEventPage.xaml b/EventMaker/EventMaker/View/CreateEventPage.xaml index e736e9e..d42a6d7 100644 --- a/EventMaker/EventMaker/View/CreateEventPage.xaml +++ b/EventMaker/EventMaker/View/CreateEventPage.xaml @@ -12,7 +12,7 @@ - +