Merge pull request #1 from Jakarta-EE-Petclinic/DETAILS

Details

puml/application/concept/Application__UseCases.puml

@@ -11,11 +11,11 @@ scale 1000 width
 
 User - (Login)
 package application {
-    (Login) -> (Navigation)
-    (Navigation) --> (Start)
-    (Navigation) --> (Info)
-    (Navigation) --> (Help)
-    (Navigation) --> (UserInfo)
-    (Navigation) --> (Logout)
+    (Application.Login) -> (Navigation)
+    (Navigation) --> (Application.Start)
+    (Navigation) --> (Application.Info)
+    (Navigation) --> (Application.Help)
+    (Navigation) --> (Application.UserInfo)
+    (Navigation) --> (Application.Logout)
 }
 @enduml

puml/owner/concept/Owner__UseCases.puml

@@ -12,14 +12,15 @@ scale 1000 width
 User - (Login)
 package owner {
     (Login) -> (Navigation)
+    (Application.Start) -> (Owner.search)
     (Navigation) --> (Owner.list)
-    (Start) -> (Owner.search)
     (Owner.list) -> (Owner.search)
     (Owner.list) --> (Owner.addNew)
-    (Owner.list) --> (Owner.edit)
-    (Owner.list) --> (Owner.delete)
+    (Owner.list) --> (Owner.details)
+    (Owner.details) --> (Owner.edit)
+    (Owner.details) --> (Owner.delete)
     package owner.pet {
-        (Owner.list) --> (Owner.Pet.list)
+        (Owner.details) --> (Owner.Pet.list)
         (Owner.Pet.list) --> (Owner.Pet.addNew)
         (Owner.Pet.list) --> (Owner.Pet.edit)
         (Owner.Pet.list) --> (Owner.Pet.delete)

puml/owner/concept/Owner__UseCases__State.puml

@@ -11,13 +11,13 @@ scale 1000 width
 
 [*] --> OWNER_LIST
 
+OWNER_LIST --> OWNER_DETAILS: button_owner_details_dialog()
+OWNER_DETAILS --> OWNER_LIST: button_owner_back_to_list()
+
 OWNER_LIST --> OWNER_NEW :   button_owner_addNew_dialog()
 OWNER_NEW --> OWNER_LIST:    button_owner_cancel_and_back()
 OWNER_NEW --> OWNER_DETAILS: button_owner_addNew_perform() OK
 
-OWNER_LIST --> OWNER_DETAILS: button_owner_details_dialog()
-OWNER_DETAILS --> OWNER_LIST: button_owner_back_to_list()
-
 OWNER_DETAILS --> OWNER_EDIT: button_owner_edit_dialog()
 OWNER_EDIT --> OWNER_DETAILS: button_owner_cancel_and_back()
 OWNER_EDIT --> OWNER_DETAILS: button_owner_update_perform() OK
@@ -28,41 +28,47 @@ OWNER_DELETE --> OWNER_DETAILS: button_owner_delete_perform() OK
 
 state OWNER_DETAILS {
 
-    [*] --> OWNER_PET_NEW: button_pet_addNew_dialog()
-    [*] --> OWNER_PET_EDIT: button_pet_edit_dialog()
-    [*] --> OWNER_PET_DELETE: button_pet_delete_dialog()
-
-    [*] --> OWNER_PET_VISIT_NEW: button_visit_addNew_dialog()
-    [*] --> OWNER_PET_VISIT_EDIT: button_visit_edit_dialog()
-    [*] --> OWNER_PET_VISIT_DELETE: button_visit_delete_dialog()
-
-    OWNER_PET_NEW --> [*] : db_pet_addNew() OK
-    OWNER_PET_EDIT --> [*] : db_pet_update() OK
-    OWNER_PET_DELETE --> [*]: db_pet_delete() OK
-
-    OWNER_PET_VISIT_NEW --> [*] : db_visit_addNew() OK
-    OWNER_PET_VISIT_EDIT --> [*] : db_visit_update() OK
-    OWNER_PET_VISIT_DELETE --> [*]: db_visit_delete() OK
-
+    [*] --> OWNER_PET_NEW: button_addNew_pet()
     state OWNER_PET_NEW {
-        OWNER_PET_NEW --> OWNER_PET_NEW : button_pet_addNew_perform() not OK, invalid
+        OWNER_PET_NEW --> OWNER_PET_NEW : pet_addNew() not OK, invalid
     }
+    OWNER_PET_NEW --> [*] : pet_addNew() OK
+
+
+    [*] --> OWNER_PET_EDIT: button_edit_pet()
     state OWNER_PET_EDIT {
-        OWNER_PET_EDIT --> OWNER_PET_EDIT : button_pet_update_perform() not OK, invalid
+        OWNER_PET_EDIT --> OWNER_PET_EDIT : pet_update() not OK, invalid
     }
+    OWNER_PET_EDIT --> [*] : pet_update() OK
+
+
+    [*] --> OWNER_PET_DELETE: button_delete_pet()
     state OWNER_PET_DELETE {
-        OWNER_PET_DELETE --> OWNER_PET_DELETE: button_pet_delete_perform() not OK, invalid
+        OWNER_PET_DELETE --> OWNER_PET_DELETE: pet_delete() not OK, invalid
     }
+    OWNER_PET_DELETE --> [*]: pet_delete() OK
+
 
+    [*] --> OWNER_PET_VISIT_NEW: button_addNew_visit()
     state OWNER_PET_VISIT_NEW {
-        OWNER_PET_VISIT_NEW --> OWNER_PET_VISIT_NEW : button_visit_addNew_perform() not OK, invalid
+        OWNER_PET_VISIT_NEW --> OWNER_PET_VISIT_NEW : visit_addNew() not OK, invalid
     }
+    OWNER_PET_VISIT_NEW --> [*] : pet_visit_addNew() OK
+
+
+    [*] --> OWNER_PET_VISIT_EDIT: button_edit_visit()
     state OWNER_PET_VISIT_EDIT {
-        OWNER_PET_VISIT_EDIT --> OWNER_PET_VISIT_EDIT : button_visit_update_perform() not OK, invalid
+        OWNER_PET_VISIT_EDIT --> OWNER_PET_VISIT_EDIT : visit_update() not OK, invalid
     }
+    OWNER_PET_VISIT_EDIT --> [*] : pet_visit_update() OK
+
+
+    [*] --> OWNER_PET_VISIT_DELETE: button_delete_visit()
     state OWNER_PET_VISIT_DELETE {
-        OWNER_PET_VISIT_DELETE --> OWNER_PET_VISIT_DELETE: button_visit_delete_perform() not OK, invalid
+        OWNER_PET_VISIT_DELETE --> OWNER_PET_VISIT_DELETE: visit_delete() not OK, invalid
     }
+    OWNER_PET_VISIT_DELETE --> [*]: pet_visit_delete() OK
+
 }
 state OWNER_EDIT {
     OWNER_EDIT --> OWNER_EDIT: button_owner_addNew_perform() not OK, invalid
@@ -75,5 +81,6 @@ state OWNER_NEW {
 }
 
 OWNER_LIST --> [*]
+OWNER_DETAILS --> [*]
 
 @enduml

puml/owner/concept/Owner__UseCases__State__details.puml

@@ -12,40 +12,45 @@ scale 1000 width
 state OWNER_DETAILS {
 
     [*] --> OWNER_PET_NEW: button_addNew_pet()
-    [*] --> OWNER_PET_EDIT: button_edit_pet()
-    [*] --> OWNER_PET_DELETE: button_delete_pet()
-
-    [*] --> OWNER_PET_VISIT_NEW: button_addNew_visit()
-    [*] --> OWNER_PET_VISIT_EDIT: button_edit_visit()
-    [*] --> OWNER_PET_VISIT_DELETE: button_delete_visit()
-
-    OWNER_PET_NEW --> [*] : pet_addNew() OK
-    OWNER_PET_EDIT --> [*] : pet_update() OK
-    OWNER_PET_DELETE --> [*]: pet_delete() OK
-
-    OWNER_PET_VISIT_NEW --> [*] : pet_visit_addNew() OK
-    OWNER_PET_VISIT_EDIT --> [*] : pet_visit_update() OK
-    OWNER_PET_VISIT_DELETE --> [*]: pet_visit_delete() OK
-
     state OWNER_PET_NEW {
         OWNER_PET_NEW --> OWNER_PET_NEW : pet_addNew() not OK, invalid
     }
+    OWNER_PET_NEW --> [*] : pet_addNew() OK
+
+
+    [*] --> OWNER_PET_EDIT: button_edit_pet()
     state OWNER_PET_EDIT {
         OWNER_PET_EDIT --> OWNER_PET_EDIT : pet_update() not OK, invalid
     }
+    OWNER_PET_EDIT --> [*] : pet_update() OK
+
+
+    [*] --> OWNER_PET_DELETE: button_delete_pet()
     state OWNER_PET_DELETE {
         OWNER_PET_DELETE --> OWNER_PET_DELETE: pet_delete() not OK, invalid
     }
+    OWNER_PET_DELETE --> [*]: pet_delete() OK
+
 
+    [*] --> OWNER_PET_VISIT_NEW: button_addNew_visit()
     state OWNER_PET_VISIT_NEW {
         OWNER_PET_VISIT_NEW --> OWNER_PET_VISIT_NEW : visit_addNew() not OK, invalid
     }
+    OWNER_PET_VISIT_NEW --> [*] : pet_visit_addNew() OK
+
+
+    [*] --> OWNER_PET_VISIT_EDIT: button_edit_visit()
     state OWNER_PET_VISIT_EDIT {
         OWNER_PET_VISIT_EDIT --> OWNER_PET_VISIT_EDIT : visit_update() not OK, invalid
     }
+    OWNER_PET_VISIT_EDIT --> [*] : pet_visit_update() OK
+
+
+    [*] --> OWNER_PET_VISIT_DELETE: button_delete_visit()
     state OWNER_PET_VISIT_DELETE {
         OWNER_PET_VISIT_DELETE --> OWNER_PET_VISIT_DELETE: visit_delete() not OK, invalid
     }
+    OWNER_PET_VISIT_DELETE --> [*]: pet_visit_delete() OK
 }
 
 

puml/owner/concept/Owner__UseCases__State__without_details.puml

@@ -43,6 +43,6 @@ state OWNER_NEW {
 }
 
 OWNER_LIST --> [*]
-
+OWNER_DETAILS --> [*]
 
 @enduml

puml/owner/concept/PetType__UseCase.puml

@@ -14,8 +14,9 @@ package pet-type {
     (Login) -> (Navigation)
     (Navigation) -> (PetType.list)
     (PetType.list) --> (PetType.search)
-    (PetType.list) ---> (PetType.addNew)
-    (PetType.list) ---> (PetType.edit)
-    (PetType.list) ---> (PetType.delete)
+    (PetType.list) --> (PetType.details)
+    (PetType.list) --> (PetType.addNew)
+    (PetType.details) ---> (PetType.edit)
+    (PetType.details) ---> (PetType.delete)
 }
 @enduml

puml/owner/concept/PetType__UseCase_State.puml

@@ -5,38 +5,37 @@ title PetType Use Case State Diagram
 'https://plantuml.com/state-diagram
 
 left to right direction
-' top to bottom direction
+'top to bottom direction
 
 scale 1000 width
 
-[*] --> PETTYPE_LIST
+[*] -> PETTYPE_LIST: button_list_dialog()
 
 PETTYPE_LIST --> PETTYPE_NEW : button_addNew_dialog()
 PETTYPE_NEW --> PETTYPE_LIST: button_cancel_and_back()
-PETTYPE_NEW --> PETTYPE_LIST2: button_addNew_perform() OK
-
-PETTYPE_LIST --> PETTYPE_EDIT: button_edit_dialog()
-PETTYPE_EDIT --> PETTYPE_LIST: button_cancel_and_back()
-PETTYPE_EDIT --> PETTYPE_LIST3: button_update_perform() OK
-
-PETTYPE_LIST --> PETTYPE_DELETE: button_delete_dialog()
-PETTYPE_DELETE --> PETTYPE_LIST: button_cancel_and_back()
-PETTYPE_DELETE --> PETTYPE_LIST4: button_delete_perform() OK
-
-PETTYPE_LIST2 --> [*]
-PETTYPE_LIST3 --> [*]
-PETTYPE_LIST4 --> [*]
-
-
 state PETTYPE_NEW {
     PETTYPE_NEW --> PETTYPE_NEW : button_addNew_perform() not OK, invalid
 }
+PETTYPE_NEW -> PETTYPE_DETAILS: button_addNew_perform() OK
+
+PETTYPE_LIST --> PETTYPE_DETAILS: button_detail_dialog()
+PETTYPE_DETAILS --> PETTYPE_LIST : button_back_to_list()
+
+PETTYPE_DETAILS --> PETTYPE_EDIT: button_edit_dialog()
+PETTYPE_EDIT --> PETTYPE_DETAILS: button_cancel_and_back()
 state PETTYPE_EDIT {
     PETTYPE_EDIT --> PETTYPE_EDIT: button_update_perform() not OK, invalid
 }
+PETTYPE_EDIT --> PETTYPE_DETAILS: button_update_perform() OK
+
+PETTYPE_DETAILS --> PETTYPE_DELETE: button_delete_dialog()
+PETTYPE_DELETE --> PETTYPE_DETAILS: button_cancel_and_back()
 state PETTYPE_DELETE {
     PETTYPE_DELETE --> PETTYPE_DELETE: button_delete_perform() not OK, invalid
 }
+PETTYPE_DELETE --> PETTYPE_DETAILS: button_delete_perform() OK
 
+PETTYPE_LIST -> [*]
+PETTYPE_DETAILS -> [*]
 
 @enduml

puml/vet/concept/Specialty__UseCase.puml

@@ -14,8 +14,9 @@ package specialty {
     (Login) -> (Navigation)
     (Navigation) -> (Specialty.list)
     (Specialty.list) --> (Specialty.search)
-    (Specialty.list) ---> (Specialty.addNew)
-    (Specialty.list) ---> (Specialty.edit)
-    (Specialty.list) ---> (Specialty.delete)
+    (Specialty.list) --> (Specialty.details)
+    (Specialty.list) --> (Specialty.addNew)
+    (Specialty.details) ---> (Specialty.edit)
+    (Specialty.details) ---> (Specialty.delete)
 }
 @enduml

puml/vet/concept/Specialty__UseCase__State.puml

@@ -9,35 +9,34 @@ left to right direction
 
 scale 1000 width
 
-[*] --> SPECIALTY_LIST
-
+[*] -> SPECIALTY_LIST: button_list_dialog(
 
 SPECIALTY_LIST --> SPECIALTY_NEW : button_addNew_dialog()
 SPECIALTY_NEW --> SPECIALTY_LIST: button_cancel_and_back()
-SPECIALTY_NEW --> SPECIALTY_LIST2: button_addNew_perform() OK
-
-SPECIALTY_LIST --> SPECIALTY_EDIT: button_edit_dialog()
-SPECIALTY_EDIT --> SPECIALTY_LIST: button_cancel_and_back()
-SPECIALTY_EDIT --> SPECIALTY_LIST3: button_update_perform() OK
-
-SPECIALTY_LIST --> SPECIALTY_DELETE: button_delete_dialog()
-SPECIALTY_DELETE --> SPECIALTY_LIST: button_acancel_and_back()
-SPECIALTY_DELETE --> SPECIALTY_LIST4: button_delete_perform() OK
-
-SPECIALTY_LIST2 --> [*]
-SPECIALTY_LIST3 --> [*]
-SPECIALTY_LIST4 --> [*]
-
-
 state SPECIALTY_NEW {
     SPECIALTY_NEW --> SPECIALTY_NEW : button_addNew_perform() not OK, invalid
 }
+SPECIALTY_NEW -> SPECIALTY_DETAILS: button_addNew_perform() OK
+
+
+SPECIALTY_LIST -> SPECIALTY_DETAILS: button_detail_dialog()
+SPECIALTY_DETAILS --> SPECIALTY_LIST: button_back_to_list()
+
+SPECIALTY_DETAILS --> SPECIALTY_EDIT: button_edit_dialog()
+SPECIALTY_EDIT --> SPECIALTY_DETAILS: button_cancel_and_back()
 state SPECIALTY_EDIT {
     SPECIALTY_EDIT --> SPECIALTY_EDIT: button_update_perform() not OK, invalid
 }
+SPECIALTY_EDIT --> SPECIALTY_DETAILS: button_update_perform() OK
+
+SPECIALTY_DETAILS --> SPECIALTY_DELETE: button_delete_dialog()
+SPECIALTY_DELETE --> SPECIALTY_DETAILS: button_acancel_and_back()
 state SPECIALTY_DELETE {
     SPECIALTY_DELETE --> SPECIALTY_DELETE: button_delete_perform() not OK, invalid
 }
+SPECIALTY_DELETE --> SPECIALTY_DETAILS: button_delete_perform() OK
 
+SPECIALTY_LIST -> [*]
+SPECIALTY_DETAILS -> [*]
 
 @enduml

puml/vet/concept/Vet__UseCase.puml

@@ -14,8 +14,9 @@ package vet {
     (Login) -> (Navigation)
     (Navigation) -> (Vet.list)
     (Vet.list) --> (Vet.search)
-    (Vet.list) ---> (Vet.addNew)
-    (Vet.list) ---> (Vet.edit)
-    (Vet.list) ---> (Vet.delete)
+    (Vet.list) --> (Vet.details)
+    (Vet.list) --> (Vet.addNew)
+    (Vet.details) ---> (Vet.edit)
+    (Vet.details) ---> (Vet.delete)
 }
 @enduml