From ee7f3eb75e58cacd653ec9bf03e075c65e52d8da Mon Sep 17 00:00:00 2001 From: marzmehr Date: Sun, 21 Jan 2024 18:08:22 -0800 Subject: [PATCH] SS-765: Remove assignment time from distribute schedule --- .../ShiftSchedule/DistributeSchedule.vue | 7 +++--- .../components/DistributeHeader.vue | 24 +++++++++++++++---- .../components/WeeklyAssignmentCard.vue | 5 +++- .../components/WeeklySchedule.vue | 5 +++- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/web/src/components/ShiftSchedule/DistributeSchedule.vue b/web/src/components/ShiftSchedule/DistributeSchedule.vue index fd9ab98f..83bf9e5d 100644 --- a/web/src/components/ShiftSchedule/DistributeSchedule.vue +++ b/web/src/components/ShiftSchedule/DistributeSchedule.vue @@ -1,7 +1,7 @@
- +
@@ -114,7 +114,8 @@ today = ''; numberOfheaderDates = 7; updateTable=0; - updateDailyTable=0; + updateDailyTable=0; + includeTime=true; errorText=''; openErrorModal=false; diff --git a/web/src/components/ShiftSchedule/components/DistributeHeader.vue b/web/src/components/ShiftSchedule/components/DistributeHeader.vue index a12850d8..30601a4b 100644 --- a/web/src/components/ShiftSchedule/components/DistributeHeader.vue +++ b/web/src/components/ShiftSchedule/components/DistributeHeader.vue @@ -25,7 +25,7 @@ - + @@ -50,8 +50,18 @@ - - + + +
+ +
Include Time
+
+
+
+
+ + + @@ -71,7 +81,7 @@ -
+
{{viewRange}}
@@ -249,6 +259,7 @@ contentState = true; allSelected = false; loadingPdf = false; + includeTimeChecked = true; selectedTeamMember = {sheriffId: '', name: 'All', email: ''} as distributeTeamMemberInfoType; @@ -272,6 +283,7 @@ mounted() { this.loadingPdf = false; this.showWeekViewChecked = true; + this.includeTimeChecked = true; this.hasPermissionToViewDutyRoster = this.userDetails.permissions.includes("ViewDutyRoster"); this.teamMemberEmailList = this.teamMemberList.map(member => member.email); @@ -295,6 +307,10 @@ }) } + public changeIncludeTime(){ + Vue.nextTick(()=> this.$emit('includeTime',this.includeTimeChecked) ) + } + public emailSchedule(){ this.errorMsg = ""; diff --git a/web/src/components/ShiftSchedule/components/WeeklyAssignmentCard.vue b/web/src/components/ShiftSchedule/components/WeeklyAssignmentCard.vue index aeddd654..b86fecbc 100644 --- a/web/src/components/ShiftSchedule/components/WeeklyAssignmentCard.vue +++ b/web/src/components/ShiftSchedule/components/WeeklyAssignmentCard.vue @@ -15,7 +15,7 @@
* - {{duty.startTime}}-{{duty.endTime}} + {{duty.startTime}}-{{duty.endTime}} {{duty.dutySubType}} {{ duty.dutyType | getTypeAbrv }}
@@ -75,6 +75,9 @@ @Prop({required: true}) scheduleInfo!: manageAssignmentsScheduleInfoType[]; + @Prop({required: true}) + includeTime!: boolean; + @commonState.State public location!: locationInfoType; diff --git a/web/src/components/ShiftSchedule/components/WeeklySchedule.vue b/web/src/components/ShiftSchedule/components/WeeklySchedule.vue index 7d782997..b4c3aa4c 100644 --- a/web/src/components/ShiftSchedule/components/WeeklySchedule.vue +++ b/web/src/components/ShiftSchedule/components/WeeklySchedule.vue @@ -47,7 +47,7 @@ @@ -80,6 +80,9 @@ @Prop({required: true}) fields!: any[]; + @Prop({required: true}) + includeTime!: boolean; + @commonState.State public location!: locationInfoType;