From 3df4043eb99e58c4fb33d8db22a4f23fa2bd703c Mon Sep 17 00:00:00 2001 From: Boris Waaub Date: Fri, 4 Jul 2025 07:45:33 +0000 Subject: [PATCH] =?UTF-8?q?Afficher=20les=20patients=20sugg=C3=A9r=C3=A9s?= =?UTF-8?q?=20et=20ajouter=20un=20s=C3=A9lecteur=20urgent/non=20urgent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChillMainBundle/Resources/public/types.ts | 71 +- .../public/vuejs/PickEntity/PickEntity.vue | 390 ++++++---- .../translations/messages+intl-icu.fr.yaml | 28 + .../Resources/public/types.ts | 476 ++++++------- .../public/vuejs/_components/AddPersons.vue | 664 +++++++++--------- .../src/Resources/public/types.ts | 57 +- .../Resources/public/vuejs/TicketApp/App.vue | 1 + .../components/ActionToolbarComponent.vue | 115 ++- .../components/AddresseeComponent.vue | 8 +- .../components/AddresseeSelectorComponent.vue | 249 ++----- .../TicketApp/components/BannerComponent.vue | 38 +- .../components/CallerSelectorComponent.vue | 85 +++ .../components/PersonsSelectorComponent.vue | 163 ++--- .../TicketHistoryEmergencyComponent.vue | 18 + .../components/TicketHistoryListComponent.vue | 50 +- .../TicketHistoryPersonComponent.vue | 9 +- .../TicketHistoryStateComponent.vue | 17 +- .../TicketApp/components/ToggleFlags.vue | 67 ++ .../TicketApp/store/modules/addressee.ts | 16 +- .../vuejs/TicketApp/store/modules/comment.ts | 11 +- .../vuejs/TicketApp/store/modules/motive.ts | 11 +- .../vuejs/TicketApp/store/modules/persons.ts | 59 +- .../vuejs/TicketApp/store/modules/ticket.ts | 39 +- .../src/translations/messages+intl-icu.fr.yml | 18 +- 24 files changed, 1539 insertions(+), 1121 deletions(-) create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryEmergencyComponent.vue create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ToggleFlags.vue diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts index 5eed6d9b4..5af22147b 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/types.ts +++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts @@ -10,6 +10,11 @@ export interface Civility { // TODO } +export interface Household { + type: "household"; + id: number; +} + export interface Job { id: number; type: "user_job"; @@ -48,16 +53,10 @@ export interface User { label: string; // todo: mainCenter; mainJob; etc.. } - -// TODO : Add missing household properties -export interface Household { - type: "household"; - id: number; -} - export interface ThirdParty { type: "thirdparty"; id: number; + text: string; firstname: string; name: string; email: string; @@ -228,3 +227,61 @@ export interface WorkflowAttachment { export interface PrivateCommentEmbeddable { comments: Record; } + +// API Exception types +export interface TransportExceptionInterface { + name: string; +} + +export interface ValidationExceptionInterface + extends TransportExceptionInterface { + name: "ValidationException"; + error: object; + violations: string[]; + titles: string[]; + propertyPaths: string[]; +} + +export interface AccessExceptionInterface extends TransportExceptionInterface { + name: "AccessException"; + violations: string[]; +} + +export interface NotFoundExceptionInterface + extends TransportExceptionInterface { + name: "NotFoundException"; +} + +export interface ServerExceptionInterface extends TransportExceptionInterface { + name: "ServerException"; + message: string; + code: number; + body: string; +} + +export interface ConflictHttpExceptionInterface + extends TransportExceptionInterface { + name: "ConflictHttpException"; + violations: string[]; +} + +export type ApiException = + | ValidationExceptionInterface + | AccessExceptionInterface + | NotFoundExceptionInterface + | ServerExceptionInterface + | ConflictHttpExceptionInterface; + +export interface Modal { + showModal: boolean; + modalDialogClass: string; +} + +export interface Selected { + result: UserGroupOrUser; +} + +export interface addNewEntities { + selected: Selected[]; + modal: Modal; +} diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue index 56e324133..1ddf054b6 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue @@ -1,142 +1,272 @@ - + + diff --git a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml index 4d16b837d..37dddae29 100644 --- a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml +++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml @@ -156,3 +156,31 @@ renderbox: no_current_address: "Sans adresse actuellement" new_household: "Nouveau ménage" no_members_yet: "Aucun membre actuellement" + +pick_entity: + add: "Ajouter" + modal_title: >- + {count, plural, + one {Indiquer un} + other {Ajouter des} + } + user: >- + {count, plural, + one {Utilisateur} + other {Utilisateurs} + } + user_group: >- + {count, plural, + one {Groupe d'utilisateur} + other {Groupes d'utilisateurs} + } + person: >- + {count, plural, + one {Usager} + other {Usagers} + } + thirdparty: >- + {count, plural, + one {Tiers} + other {Tiers} + } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/types.ts b/src/Bundle/ChillPersonBundle/Resources/public/types.ts index 32a0c5934..18ce72046 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/types.ts +++ b/src/Bundle/ChillPersonBundle/Resources/public/types.ts @@ -1,317 +1,309 @@ import { StoredObject } from "ChillDocStoreAssets/types"; import { Address, - Scope, - Center, - Civility, - DateTime, - User, - WorkflowAvailable, - Job, - Household, + Center, + Civility, + DateTime, User, UserGroup, - WorkflowAvailable, + Household, ThirdParty, + WorkflowAvailable, + Scope, + Job, PrivateCommentEmbeddable, -} from "ChillMainAssets/types"; -import { StoredObject } from "ChillDocStoreAssets/types"; +} from "../../../ChillMainBundle/Resources/public/types"; import { Thirdparty } from "../../../ChillThirdPartyBundle/Resources/public/types"; import { Calendar } from "../../../ChillCalendarBundle/Resources/public/types"; export interface Person { - id: number; - type: "person"; - text: string; - textAge: string; - firstName: string; - lastName: string; - current_household_address: Address | null; - birthdate: DateTime | null; - deathdate: DateTime | null; - age: number; - phonenumber: string; - mobilenumber: string; - email: string; - gender: "woman" | "man" | "other"; - centers: Center[]; - civility: Civility | null; - current_household_id: number; - current_residential_addresses: Address[]; + id: number; + type: "person"; + text: string; + textAge: string; + firstName: string; + lastName: string; + current_household_address: Address | null; + birthdate: DateTime | null; + deathdate: DateTime | null; + age: number; + phonenumber: string; + mobilenumber: string; + email: string; + gender: "woman" | "man" | "other"; + centers: Center[]; + civility: Civility | null; + current_household_id: number; + current_residential_addresses: Address[]; } export interface AccompanyingPeriod { - id: number; - addressLocation?: Address | null; - administrativeLocation?: Location | null; - calendars: Calendar[]; - closingDate?: Date | null; - closingMotive?: ClosingMotive | null; - comments: Comment[]; - confidential: boolean; - createdAt?: Date | null; - createdBy?: User | null; - emergency: boolean; - intensity?: "occasional" | "regular"; - job?: Job | null; - locationHistories: AccompanyingPeriodLocationHistory[]; - openingDate?: Date | null; - origin?: Origin | null; - participations: AccompanyingPeriodParticipation[]; - personLocation?: Person | null; - pinnedComment?: Comment | null; - preventUserIsChangedNotification: boolean; - remark: string; - requestorAnonymous: boolean; - requestorPerson?: Person | null; - requestorThirdParty?: Thirdparty | null; - resources: AccompanyingPeriodResource[]; - scopes: Scope[]; - socialIssues: SocialIssue[]; - step?: - | "CLOSED" - | "CONFIRMED" - | "CONFIRMED_INACTIVE_SHORT" - | "CONFIRMED_INACTIVE_LONG" - | "DRAFT"; -} - -export interface AccompanyingPeriodWorkEvaluationDocument { - id: number; - type: "accompanying_period_work_evaluation_document"; - storedObject: StoredObject; - title: string; - createdAt: DateTime | null; - createdBy: User | null; - updatedAt: DateTime | null; - updatedBy: User | null; - workflows_availables: WorkflowAvailable[]; - workflows: object[]; + id: number; + addressLocation?: Address | null; + administrativeLocation?: Location | null; + calendars: Calendar[]; + closingDate?: Date | null; + closingMotive?: ClosingMotive | null; + comments: Comment[]; + confidential: boolean; + createdAt?: Date | null; + createdBy?: User | null; + emergency: boolean; + intensity?: "occasional" | "regular"; + job?: Job | null; + locationHistories: AccompanyingPeriodLocationHistory[]; + openingDate?: Date | null; + origin?: Origin | null; + participations: AccompanyingPeriodParticipation[]; + personLocation?: Person | null; + pinnedComment?: Comment | null; + preventUserIsChangedNotification: boolean; + remark: string; + requestorAnonymous: boolean; + requestorPerson?: Person | null; + requestorThirdParty?: Thirdparty | null; + resources: AccompanyingPeriodResource[]; + scopes: Scope[]; + socialIssues: SocialIssue[]; + step?: + | "CLOSED" + | "CONFIRMED" + | "CONFIRMED_INACTIVE_SHORT" + | "CONFIRMED_INACTIVE_LONG" + | "DRAFT"; } export interface AccompanyingPeriodWork { - id: number; - accompanyingPeriod?: AccompanyingPeriod; - accompanyingPeriodWorkEvaluations: AccompanyingPeriodWorkEvaluation[]; - createdAt?: string; - createdAutomatically: boolean; - createdAutomaticallyReason: string; - createdBy: User; - endDate?: string; - goals: AccompanyingPeriodWorkGoal[]; - handlingThierParty?: Thirdparty; - note: string; - persons: Person[]; - privateComment: PrivateCommentEmbeddable; - referrersHistory: AccompanyingPeriodWorkReferrerHistory[]; - results: Result[]; - socialAction?: SocialAction; - startDate?: string; - thirdParties: Thirdparty[]; - updatedAt?: string; - updatedBy: User; - version: number; + id: number; + accompanyingPeriod?: AccompanyingPeriod; + accompanyingPeriodWorkEvaluations: AccompanyingPeriodWorkEvaluation[]; + createdAt?: string; + createdAutomatically: boolean; + createdAutomaticallyReason: string; + createdBy: User; + endDate?: string; + goals: AccompanyingPeriodWorkGoal[]; + handlingThierParty?: Thirdparty; + note: string; + persons: Person[]; + privateComment: PrivateCommentEmbeddable; + referrersHistory: AccompanyingPeriodWorkReferrerHistory[]; + results: Result[]; + socialAction?: SocialAction; + startDate?: string; + thirdParties: Thirdparty[]; + updatedAt?: string; + updatedBy: User; + version: number; } -interface SocialAction { - id: number; - parent?: SocialAction | null; - children: SocialAction[]; - issue?: SocialIssue | null; - ordering: number; - title: { - fr: string; - }; - defaultNotificationDelay?: string | null; - desactivationDate?: string | null; - evaluations: Evaluation[]; - goals: Goal[]; - results: Result[]; +export interface SocialAction { + id: number; + parent?: SocialAction | null; + children: SocialAction[]; + issue?: SocialIssue | null; + ordering: number; + title: { + fr: string; + }; + defaultNotificationDelay?: string | null; + desactivationDate?: string | null; + evaluations: Evaluation[]; + goals: Goal[]; + results: Result[]; } export interface AccompanyingPeriodResource { - id: number; - accompanyingPeriod: AccompanyingPeriod; - comment?: string | null; - person?: Person | null; - thirdParty?: Thirdparty | null; + id: number; + accompanyingPeriod: AccompanyingPeriod; + comment?: string | null; + person?: Person | null; + thirdParty?: Thirdparty | null; } export interface Origin { - id: number; - label: { - fr: string; - }; - noActiveAfter: DateTime; + id: number; + label: { + fr: string; + }; + noActiveAfter: DateTime; } export interface ClosingMotive { - id: number; - active: boolean; - name: { - fr: string; - }; - ordering: number; - isCanceledAccompanyingPeriod: boolean; - parent?: ClosingMotive | null; - children: ClosingMotive[]; + id: number; + active: boolean; + name: { + fr: string; + }; + ordering: number; + isCanceledAccompanyingPeriod: boolean; + parent?: ClosingMotive | null; + children: ClosingMotive[]; } export interface AccompanyingPeriodParticipation { - id: number; - startDate: DateTime; - endDate?: DateTime | null; - accompanyingPeriod: AccompanyingPeriod; - person: Person; + id: number; + startDate: DateTime; + endDate?: DateTime | null; + accompanyingPeriod: AccompanyingPeriod; + person: Person; } export interface AccompanyingPeriodLocationHistory { - id: number; - startDate: DateTime; - endDate?: DateTime | null; - addressLocation?: Address | null; - period: AccompanyingPeriod; - personLocation?: Person | null; + id: number; + startDate: DateTime; + endDate?: DateTime | null; + addressLocation?: Address | null; + period: AccompanyingPeriod; + personLocation?: Person | null; } export interface SocialIssue { - id: number; - parent?: SocialIssue | null; - children: SocialIssue[]; - socialActions?: SocialAction[] | null; - ordering: number; - title: { - fr: string; - }; - desactivationDate?: string | null; + id: number; + parent?: SocialIssue | null; + children: SocialIssue[]; + socialActions?: SocialAction[] | null; + ordering: number; + title: { + fr: string; + }; + desactivationDate?: string | null; } export interface Goal { - id: number; - results: Result[]; - socialActions?: SocialAction[] | null; - title: { - fr: string; - }; -} - -export interface Result { - id: number; - accompanyingPeriodWorks: AccompanyingPeriodWork[]; - accompanyingPeriodWorkGoals: AccompanyingPeriodWorkGoal[]; - goals: Goal[]; - socialActions: SocialAction[]; - title: { - fr: string; - }; - desactivationDate?: string | null; + id: number; + results: Result[]; + socialActions?: SocialAction[] | null; + title: { + fr: string; + }; } export interface AccompanyingPeriodWorkGoal { - id: number; - accompanyingPeriodWork: AccompanyingPeriodWork; - goal: Goal; - note: string; - results: Result[]; + id: number; + accompanyingPeriodWork: AccompanyingPeriodWork; + goal: Goal; + note: string; + results: Result[]; } export interface AccompanyingPeriodWorkEvaluation { - accompanyingPeriodWork: AccompanyingPeriodWork | null; - comment: string; - createdAt: DateTime | null; - createdBy: User | null; - documents: AccompanyingPeriodWorkEvaluationDocument[]; - endDate: DateTime | null; - evaluation: Evaluation | null; - id: number | null; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - key: any; - maxDate: DateTime | null; - startDate: DateTime | null; - updatedAt: DateTime | null; - updatedBy: User | null; - warningInterval: string | null; - timeSpent: number | null; + accompanyingPeriodWork: AccompanyingPeriodWork | null; + comment: string; + createdAt: DateTime | null; + createdBy: User | null; + documents: AccompanyingPeriodWorkEvaluationDocument[]; + endDate: DateTime | null; + evaluation: Evaluation | null; + id: number | null; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + key: any; + maxDate: DateTime | null; + startDate: DateTime | null; + updatedAt: DateTime | null; + updatedBy: User | null; + warningInterval: string | null; + timeSpent: number | null; } export interface Evaluation { - id: number; - url: string; - socialActions: SocialAction[]; - title: { - fr: string; - }; - active: boolean; - delay: string; - notificationDelay: string; + id: number; + url: string; + socialActions: SocialAction[]; + title: { + fr: string; + }; + active: boolean; + delay: string; + notificationDelay: string; } export interface AccompanyingPeriodWorkReferrerHistory { - id: number; - accompanyingPeriodWork: AccompanyingPeriodWork; - user: User; - startDate: DateTime; - endDate: DateTime | null; - createdAt: DateTime; - updatedAt: DateTime | null; - createdBy: User; - updatedBy: User | null; + id: number; + accompanyingPeriodWork: AccompanyingPeriodWork; + user: User; + startDate: DateTime; + endDate: DateTime | null; + createdAt: DateTime; + updatedAt: DateTime | null; + createdBy: User; + updatedBy: User | null; } +export interface AccompanyingPeriodWorkEvaluationDocument { + id: number; + type: "accompanying_period_work_evaluation_document"; + storedObject: StoredObject; + title: string; + createdAt: DateTime | null; + createdBy: User | null; + updatedAt: DateTime | null; + updatedBy: User | null; + workflows_availables: WorkflowAvailable[]; + workflows: object[]; +} + +export type EntityType = + | "user_group" + | "user" + | "person" + | "third_party" + | "household"; + export type Entities = (UserGroup | User | Person | ThirdParty | Household) & { - address?: Address | null; - kind?: string; - text?: string; - profession?: string; + address?: Address | null; + kind?: string; + text?: string; + profession?: string; }; export type Result = Entities & { - parent?: Entities | null; + parent?: Entities | null; }; export interface Suggestion { - key: string; - relevance: number; - result: Result; + key: string; + relevance: number; + result: Result; } export interface SearchPagination { - first: number; - items_per_page: number; - next: number | null; - previous: number | null; - more: boolean; + first: number; + items_per_page: number; + next: number | null; + previous: number | null; + more: boolean; } export interface Search { - count: number; - pagination: SearchPagination; - results: Suggestion[]; + count: number; + pagination: SearchPagination; + results: Suggestion[]; } export interface SearchOptions { - uniq: boolean; - type: string[]; - priority: number | null; - button: { - size: string; - class: string; - type: string; - display: string; - }; + uniq: boolean; + type: string[]; + priority: number | null; + button: { + size: string; + class: string; + type: string; + display: string; + }; } export class MakeFetchException extends Error { - sta: number; - txt: string; - violations: unknown | null; + sta: number; + txt: string; + violations: unknown | null; - constructor(txt: string, sta: number, violations: unknown | null = null) { - super(txt); - this.name = "ValidationException"; - this.sta = sta; - this.txt = txt; - this.violations = violations; - Object.setPrototypeOf(this, MakeFetchException.prototype); - } + constructor(txt: string, sta: number, violations: unknown | null = null) { + super(txt); + this.name = "ValidationException"; + this.sta = sta; + this.txt = txt; + this.violations = violations; + Object.setPrototypeOf(this, MakeFetchException.prototype); + } } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue index 670f0ea30..186b79e1d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue @@ -11,10 +11,10 @@ - - - - - + + + @@ -442,42 +454,42 @@ li.add-persons { } } div.body-head { - overflow-y: unset; - div.modal-body:first-child { - margin: auto 4em; - div.search { - position: relative; - input { - width: 100%; - padding: 1.2em 1.5em 1.2em 2.5em; - } - i { - position: absolute; - opacity: 0.5; - padding: 0.65em 0; - top: 50%; - } - i.fa-search { - left: 0.5em; - } - i.fa-times { - right: 1em; - padding: 0.75em 0; - cursor: pointer; - } + overflow-y: unset; + div.modal-body:first-child { + margin: auto 4em; + div.search { + position: relative; + input { + width: 100%; + padding: 1.2em 1.5em 1.2em 2.5em; + } + i { + position: absolute; + opacity: 0.5; + padding: 0.65em 0; + top: 50%; + } + i.fa-search { + left: 0.5em; + } + i.fa-times { + right: 1em; + padding: 0.75em 0; + cursor: pointer; + } + } } - } - div.modal-body:last-child { - padding-bottom: 0; - } - div.count { - margin: -0.5em 0 0.7em; - display: flex; - justify-content: space-between; - a { - cursor: pointer; + div.modal-body:last-child { + padding-bottom: 0; + } + div.count { + margin: -0.5em 0 0.7em; + display: flex; + justify-content: space-between; + a { + cursor: pointer; + } } - } } .create-button > a { margin-top: 0.5em; diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts index 897387bfc..c048121cf 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts @@ -15,7 +15,7 @@ export interface Motive { export type TicketState = "open" | "closed"; -export type TicketEmergencyState = "yes"|"no"; +export type TicketEmergencyState = "yes" | "no"; interface TicketHistory { event_type: T; @@ -75,42 +75,52 @@ export interface AddresseeState { export interface PersonsState { persons: Person[]; } +export interface CallerState { + new_caller: Person | null; +} export interface StateChange { new_state: TicketState; } -export interface StateChange { - new_state: TicketState; +export interface EmergencyChange { + new_emergency: TicketEmergencyState; } export interface CreateTicketState { by: User; } -interface AddPersonEvent extends TicketHistory<"add_person", PersonHistory> {} export type AddCommentEvent = TicketHistory<"add_comment", Comment>; export type SetMotiveEvent = TicketHistory<"set_motive", MotiveHistory>; -//interface AddAddressee extends TicketHistory<"add_addressee", AddresseeHistory> {}; -//interface RemoveAddressee extends TicketHistory<"remove_addressee", AddresseeHistory> {}; -export interface AddresseesStateEvent - extends TicketHistory<"addressees_state", AddresseeState> {} -export interface CreateTicketEvent - extends TicketHistory<"create_ticket", CreateTicketState> {} -export interface PersonStateEvent - extends TicketHistory<"persons_state", PersonsState> {} -export interface ChangeStateEvent - extends TicketHistory<"state_change", StateChange> {} +export type AddPersonEvent = TicketHistory<"add_person", PersonHistory>; +export type AddresseesStateEvent = TicketHistory< + "addressees_state", + AddresseeState +>; +export type CreateTicketEvent = TicketHistory< + "create_ticket", + CreateTicketState +>; +export type PersonStateEvent = TicketHistory<"persons_state", PersonsState>; +export type ChangeStateEvent = TicketHistory<"state_change", StateChange>; +export type EmergencyStateEvent = TicketHistory< + "emergency_change", + EmergencyChange +>; +export type CallerStateEvent = TicketHistory<"set_caller", CallerState>; -// TODO : Remove add_persont event from TicketHistoryLine +// TODO : Remove add_person event from TicketHistoryLine export type TicketHistoryLine = | AddPersonEvent | CreateTicketEvent | AddCommentEvent - | SetMotiveEvent /*AddAddressee | RemoveAddressee | */ + | SetMotiveEvent | AddresseesStateEvent | PersonStateEvent - | ChangeStateEvent; + | ChangeStateEvent + | EmergencyStateEvent + | CallerStateEvent; export interface Ticket { type: "ticket_ticket"; @@ -124,16 +134,5 @@ export interface Ticket { updatedBy: User | null; currentState: TicketState | null; emergency: TicketEmergencyState | null; -} - -export interface addNewPersons { - selected: Selected[]; - modal: Modal; -} -export interface Modal { - showModal: boolean; - modalDialogClass: string; -} -export interface Selected { - result: User; + caller: Person | null; } diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue index 9263fd30e..ec52ce9ee 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue @@ -34,6 +34,7 @@ onMounted(async () => { await store.dispatch("fetchMotives"); await store.dispatch("fetchUserGroups"); await store.dispatch("fetchUsers"); + await store.dispatch("getSuggestedPersons"); } catch (error) { toast.error(error as string); } diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue index eca289ef1..5eaade60d 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue @@ -2,25 +2,38 @@
-
+ +
-
+ - @@ -29,20 +42,40 @@ :motives="motives" v-if="activeTab === 'set_motive'" /> - -
    -
  • - -
    • + + +
+
+
+ +
+
+ +
+
+
+ +
-
@@ -67,8 +95,16 @@ Annuler
  • - Annuler + + >
  • diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue index 848f827a5..12489f91a 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue @@ -3,17 +3,25 @@
    -

    #{{ ticket.id }}

    - {{ ticket.currentMotive.label.fr }} + #{{ ticket.id }} {{ ticket.currentMotive.label.fr }}

    {{ trans(CHILL_TICKET_TICKET_BANNER_NO_MOTIVE) }}

    +

    + {{ + ticket.currentPersons + .map((person) => person.text) + .join(", ") + }} +

    + +
    -
    +
    +

    + {{ trans(CHILL_TICKET_TICKET_BANNER_CALLER) }} +

    + +
    +

    {{ trans(CHILL_TICKET_TICKET_BANNER_CONCERNED_USAGER) }}

    @@ -59,7 +85,9 @@ action="show" >
    -
    +

    {{ trans(CHILL_TICKET_TICKET_BANNER_SPEAKER) }}

    @@ -84,6 +112,7 @@ import { ref, computed } from "vue"; // Components import AddresseeComponent from "./AddresseeComponent.vue"; +import ToggleFlags from "./ToggleFlags.vue"; import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue"; // Types @@ -104,6 +133,7 @@ import { CHILL_TICKET_TICKET_BANNER_MINUTES, CHILL_TICKET_TICKET_BANNER_SECONDS, CHILL_TICKET_TICKET_BANNER_AND, + CHILL_TICKET_TICKET_BANNER_CALLER, } from "translator"; // Store diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue new file mode 100644 index 000000000..1afa0691f --- /dev/null +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue @@ -0,0 +1,85 @@ + + + + diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue index fa8fd4db9..0e0a55b32 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue @@ -1,135 +1,70 @@ diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts index 3b833b21b..a6c00253a 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts @@ -7,6 +7,7 @@ import { Module } from "vuex"; import { RootState } from ".."; import { + ApiException, User, UserGroup, UserGroupOrUser, @@ -46,8 +47,9 @@ export const moduleAddressee: Module = { commit("setUserGroups", results); }, ); - } catch (e: any) { - throw e.name; + } catch (e: unknown) { + const error = e as ApiException; + throw error.name; } }, fetchUsers({ commit }) { @@ -55,8 +57,9 @@ export const moduleAddressee: Module = { fetchResults("/api/1.0/main/user.json").then((results) => { commit("setUsers", results); }); - } catch (e: any) { - throw e.name; + } catch (e: unknown) { + const error = e as ApiException; + throw error.name; } }, @@ -76,8 +79,9 @@ export const moduleAddressee: Module = { }, ); commit("setTicket", result); - } catch (e: any) { - throw e.name; + } catch (e: unknown) { + const error = e as ApiException; + throw error.name; } }, }, diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts index 34456ce07..2e56ff28a 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts @@ -1,12 +1,10 @@ -import { - fetchResults, - makeFetch, -} from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods"; +import { makeFetch } from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods"; import { Module } from "vuex"; import { RootState } from ".."; import { Comment } from "../../../../types"; +import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types"; export interface State { comments: Comment[]; @@ -31,8 +29,9 @@ export const moduleComment: Module = { { content }, ); commit("setTicket", result); - } catch (e: any) { - throw e.name; + } catch (e: unknown) { + const error = e as ApiException; + throw error.name; } }, }, diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts index abd8547d2..f8e775232 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts @@ -7,6 +7,7 @@ import { Module } from "vuex"; import { RootState } from ".."; import { Motive } from "../../../../types"; +import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types"; export interface State { motives: Motive[]; @@ -33,8 +34,9 @@ export const moduleMotive: Module = { "/api/1.0/ticket/motive.json", )) as Motive[]; commit("setMotives", results); - } catch (e: any) { - throw e.name; + } catch (e: unknown) { + const error = e as ApiException; + throw error.name; } }, @@ -55,8 +57,9 @@ export const moduleMotive: Module = { }, ); commit("setTicket", result); - } catch (e: any) { - throw e.name; + } catch (e: unknown) { + const error = e as ApiException; + throw error.name; } }, }, diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts index db0e8cdb6..be09a41a8 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts @@ -1,12 +1,28 @@ import { makeFetch } from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods"; import { Person } from "../../../../../../../../ChillPersonBundle/Resources/public/types"; +import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types"; import { Module } from "vuex"; import { RootState } from ".."; import { Ticket } from "../../../../types"; -export interface State {} +export interface State { + persons: Person[]; +} export const modulePersons: Module = { + state: () => ({ + persons: [] as Person[], + }), + getters: { + getPersons(state) { + return state.persons; + }, + }, + mutations: { + setPersons(state, persons: Person[]) { + state.persons = persons; + }, + }, actions: { async setPersons( { commit, rootState: RootState }, @@ -25,8 +41,45 @@ export const modulePersons: Module = { commit("setTicket", result); return Promise.resolve(); - } catch (e: any) { - throw e.name; + } catch (e: unknown) { + const error = e as ApiException; + throw error.name; + } + }, + async setCaller( + { commit, rootState: RootState }, + payload: { caller: Person | null }, + ) { + try { + const caller = payload.caller + ? { + id: payload.caller.id, + type: payload.caller.type, + } + : null; + const result: Ticket = await makeFetch( + "POST", + `/api/1.0/ticket/ticket/${RootState.ticket.ticket.id}/set-caller`, + { caller }, + ); + commit("setTicket", result as Ticket); + } catch (e: unknown) { + const error = e as ApiException; + throw error.name; + } + }, + + async getSuggestedPersons({ commit, rootState: RootState }) { + try { + const ticketId = RootState.ticket.ticket.id; + const result: Person[] = await makeFetch( + "GET", + `/api/1.0/ticket/ticket/${ticketId}/suggest-person`, + ); + commit("setPersons", result); + } catch (e: unknown) { + const error = e as ApiException; + throw error.name; } }, }, diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts index f4c9037a6..25acaeaed 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts @@ -1,8 +1,9 @@ import { Module } from "vuex"; import { RootState } from ".."; -import { Ticket } from "../../../../types"; +import { Ticket, TicketEmergencyState } from "../../../../types"; import { makeFetch } from "ChillMainAssets/lib/api/apiMethods"; +import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types"; export interface State { ticket: Ticket; @@ -13,18 +14,23 @@ export const moduleTicket: Module = { state: () => ({ ticket: {} as Ticket, action_icons: { - add_person: "fa fa-eyedropper", + add_person: "fa fa-user-plus", add_comment: "fa fa-comment", set_motive: "fa fa-paint-brush", addressees_state: "fa fa-paper-plane", - persons_state: "fa fa-eyedropper", - state_change: "fa fa-bolt", + persons_state: "fa fa-user", + set_caller: "fa fa-phone", + state_change: "", + emergency_change: "", }, }), getters: { isOpen(state) { return state.ticket.currentState === "open"; }, + isEmergency(state) { + return state.ticket.emergency == "yes" ? true : false; + }, getTicket(state) { state.ticket.history = state.ticket.history.sort((a, b) => b.at.datetime.localeCompare(a.at.datetime), @@ -52,8 +58,9 @@ export const moduleTicket: Module = { `/api/1.0/ticket/ticket/${state.ticket.id}/close`, ); commit("setTicket", result as Ticket); - } catch (e: any) { - throw e.name; + } catch (e: unknown) { + const error = e as ApiException; + throw error.name; } }, async reopenTicket({ commit, state }) { @@ -63,8 +70,24 @@ export const moduleTicket: Module = { `/api/1.0/ticket/ticket/${state.ticket.id}/open`, ); commit("setTicket", result as Ticket); - } catch (e: any) { - throw e.name; + } catch (e: unknown) { + const error = e as ApiException; + throw error.name; + } + }, + async toggleEmergency( + { commit, state }, + emergency: TicketEmergencyState, + ) { + try { + const result: Ticket = await makeFetch( + "POST", + `/api/1.0/ticket/ticket/${state.ticket.id}/emergency/${emergency}`, + ); + commit("setTicket", result as Ticket); + } catch (e: unknown) { + const error = e as ApiException; + throw error.name; } }, }, diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml index b3cbb32c1..86b7dd046 100644 --- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml +++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml @@ -6,6 +6,15 @@ chill_ticket: in_alert: Tickets en alerte (délai de résolution dépassé) created_between: Créés entre ticket: + history: + add_comment: "Nouveau commentaire" + addressees_state: "Attributions" + persons_state: "Usagé(s) concerné(s)" + set_caller: "Appelant Concerné" + set_motive: "Nouveau motifs" + create_ticket: "Ticket créé" + state_change: "" + emergency_change: "" previous_tickets: "Précédents tickets" actions_toolbar: cancel: "Annuler" @@ -34,13 +43,17 @@ chill_ticket: success: "Attribution effectuée" error: "Aucun destinataire sélectionné" set_persons: - title: "Usagers concernés" + title: "Appelant et usager(s)" + title_person: "Usager(s)" + title_caller: "Appelant" user_label: "Ajouter un usager" - success: "Usager ajouté" + caller_label: "Ajouter un appelant" + success: "Appelants et usagers mis à jour" error: "Aucun usager sélectionné" banner: concerned_usager: "Usagers concernés" speaker: "Attribué à" + caller: "Appelant" open: "Ouvert" closed: "Fermé" since: "Depuis {time}" @@ -70,3 +83,4 @@ chill_ticket: other {# secondes} } no_motive: "Pas de motif" + emergency: "URGENT"