Resolve merge conflicts

Author: p-xp

docs/DeveloperGuide.md

@@ -349,9 +349,9 @@ Let's narrow down the guest list based on specific criteria using the `guest fil
 
 Before we can begin filtering our guests, we must add more guests to the list. Enter each of the following lines one-by-one into WedLog. Each line will add a new guest to the guest list.
 
-`guest add n/Mary Fowl t/friends`
-`guest add n/Bob White`
-`guest add t/friends t/university n/Lily Mae`
+`guest add n/Mary Fowl t/friends` <br>
+`guest add n/Bob White` <br>
+`guest add t/friends t/university n/Lily Mae` <br>
 
 <box type="tip">
 

docs/UserGuide.md

@@ -27,23 +27,26 @@
       <site-nav>
 * [Home]({{ baseUrl }}/index.html)
 * [User Guide]({{ baseUrl }}/UserGuide.html) :expanded:
-  * [Quick Start]({{ baseUrl }}/UserGuide.html#1-quick-start)
-  * [Features]({{ baseUrl }}/UserGuide.html#2-features)
-  * [FAQ]({{ baseUrl }}/UserGuide.html#3-faq)
-  * [Known Issues]({{ baseUrl }}/UserGuide.html#4-known-issues)
-  * [Future Implementations]({{ baseUrl }}/UserGuide.html#5-future-implementations)
-  * [Command Summary]({{ baseUrl }}/UserGuide.html#6-command-summary)
-  * [Appendices]({{ baseUrl }}/UserGuide.html#7-appendices)
+  * [How to Use This Guide]({{ baseUrl }}/UserGuide.html#1-how-to-use-this-guide)
+  * [Getting Started]({{ baseUrl }}/UserGuide.html#2-getting-started)
+  * [Understanding the WedLog Interface]({{ baseUrl }}/UserGuide.html#3-understanding-the-wedlog-interface)
+  * [WedLog Tutorial]({{ baseUrl }}/UserGuide.html#4-wedlog-tutorial)
+  * [Features]({{ baseUrl }}/UserGuide.html#5-features)
+  * [FAQ]({{ baseUrl }}/UserGuide.html#6-faq)
+  * [Known Issues]({{ baseUrl }}/UserGuide.html#7-known-issues)
+  * [Future Implementations]({{ baseUrl }}/UserGuide.html#8-future-implementations)
+  * [Command Summary]({{ baseUrl }}/UserGuide.html#9-command-summary)
+  * [Appendix: Acceptable Values for Parameters]({{ baseUrl }}/UserGuide.html#10-appendix-acceptable-values-for-parameters)
 * [Developer Guide]({{ baseUrl }}/DeveloperGuide.html) :expanded:
-  * [Acknowledgements]({{ baseUrl }}/DeveloperGuide.html#acknowledgements)
-  * [Setting Up]({{ baseUrl }}/DeveloperGuide.html#setting-up-getting-started)
-  * [Design]({{ baseUrl }}/DeveloperGuide.html#design)
-  * [Implementation]({{ baseUrl }}/DeveloperGuide.html#implementation)
-  * [Documentation, logging, testing, configuration, dev-ops]({{ baseUrl }}/DeveloperGuide.html#documentation-logging-testing-configuration-dev-ops)
-  * [Appendix A: Requirements]({{ baseUrl }}/DeveloperGuide.html#appendix-a-requirements)
-  * [Appendix B: Instructions for manual testing]({{ baseUrl }}/DeveloperGuide.html#appendix-b-instructions-for-manual-testing)
-  * [Appendix C: Planned Enhancements]({{ baseUrl }}/DeveloperGuide.html#appendix-c-planned-enhancements)
-  * [Appendix D: Effort]({{baseUrl}}/DeveloperGuide.html#appendix-d-effort)
+  * [Acknowledgements]({{ baseUrl }}/DeveloperGuide.html#1-acknowledgements)
+  * [Setting Up, Getting Started]({{ baseUrl }}/DeveloperGuide.html#2-setting-up-getting-started)
+  * [Design]({{ baseUrl }}/DeveloperGuide.html#3-design)
+  * [Implementation]({{ baseUrl }}/DeveloperGuide.html#4-implementation)
+  * [Documentation, logging, testing, configuration, dev-ops]({{ baseUrl }}/DeveloperGuide.html#5-documentation-logging-testing-configuration-dev-ops)
+  * [Appendix A: Requirements]({{ baseUrl }}/DeveloperGuide.html#6-appendix-a-requirements)
+  * [Appendix B: Instructions for manual testing]({{ baseUrl }}/DeveloperGuide.html#7-appendix-b-instructions-for-manual-testing)
+  * [Appendix C: Planned Enhancements]({{ baseUrl }}/DeveloperGuide.html#8-appendix-c-planned-enhancements)
+  * [Appendix D: Effort]({{baseUrl}}/DeveloperGuide.html#9-appendix-d-effort)
 * Tutorials
   * [Tracing code]({{ baseUrl }}/tutorials/TracingCode.html)
   * [Adding a command]({{ baseUrl }}/tutorials/AddRemark.html)

docs/_markbind/layouts/default.md

@@ -12,5 +12,6 @@ end note
 
 GuestRsvpPredicate .up.|> Predicate
 GuestTablePredicate .up.|> Predicate
+GuestDietaryPredicate .up.|> Predicate
 
 @enduml

docs/diagrams/FilterGuestPredicateClassDiagram.puml

@@ -14,5 +14,6 @@ NamePredicate .up.|> Predicate
 AddressPredicate .up.|> Predicate
 EmailPredicate .up.|> Predicate
 PhonePredicate .up.|> Predicate
+TagPredicate .up.|> Predicate
 
 @enduml

docs/diagrams/FilterGuestSequenceDiagram.puml

@@ -0,0 +1,49 @@
+@startuml
+!include style.puml
+
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR
+participant ":XYZCommandParser" as XYZCommandParser LOGIC_COLOR
+participant ":XYZFilterCommandParser" as XYZFilterCommandParser LOGIC_COLOR
+end box
+
+note left LogicManager
+input is "XYZ filter n/John r/yes"
+end note
+[-> LogicManager: execute(input)
+activate LogicManager
+
+LogicManager -> AddressBookParser : parseCommand(input)
+activate AddressBookParser
+
+create XYZCommandParser
+AddressBookParser -> XYZCommandParser
+activate XYZCommandParser
+
+create XYZFilterCommandParser
+XYZCommandParser -> XYZFilterCommandParser
+activate XYZFilterCommandParser
+group ref [Create XYZFilterCommand]
+    XYZFilterCommandParser -[hidden]>
+end
+
+
+XYZFilterCommandParser --> XYZCommandParser : f
+deactivate XYZCommandParser
+
+XYZCommandParser --> AddressBookParser : f
+deactivate XYZCommandParser
+
+AddressBookParser --> LogicManager : f
+deactivate AddressBookParser
+
+group ref [Execute XYZFilterCommand]
+    LogicManager -[hidden]>
+end
+
+[<-- LogicManager : r
+deactivate LogicManager
+
+@enduml