Merge pull request #179 from marzmehr/SS-747

SS-760 and SS-761: wording changes
bcgov · Oct 28, 2023 · 5f03ed0 · 5f03ed0
2 parents 1c0edda + 831a48d
commit 5f03ed0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/web/src/components/Home.vue b/web/src/components/Home.vue
@@ -34,7 +34,7 @@
                                 <b-card-header class="h3 bg-primary text-white">Training Status</b-card-header>
                                 <b-card-body>                        
                                     <b-alert
-                                        v-for="item,inx in training.notmet"
+                                        v-for="item,inx in training.nottaken"
                                         :key="'not-met-'+inx"
                                         class="mx-2 my-3"
                                         variant="danger"
@@ -116,12 +116,12 @@ export default class Home extends Vue {
     location = {} as locationInfoType;
     
     trainingTypeOptions: leaveTrainingTypeInfoType[] = [];
-    statusOptions = {danger:'Not Met', warning:'Expired', court:'Expiring Soon'}
+    statusOptions = {danger:'Not Taken', warning:'Expired', court:'Expiring Soon'}
     training: { 
-        notmet: trainingReportInfoType[]; 
+        nottaken: trainingReportInfoType[]; 
         expired: trainingReportInfoType[]; 
         expiringsoon: trainingReportInfoType[]; 
-    } = { notmet: [], expired: [], expiringsoon: [] }
+    } = { nottaken: [], expired: [], expiringsoon: [] }
 
     trainingAlert=false;
 
@@ -208,7 +208,7 @@ export default class Home extends Vue {
                 })
             }
         }
-        this.training = { notmet:[], expired:[],expiringsoon:[] }
+        this.training = { nottaken:[], expired:[],expiringsoon:[] }
         for (const trainingData of sheriffTrainings){
             this.addTrainingToReport(sheriffData, trainingData);            
         }
@@ -257,12 +257,15 @@ export default class Home extends Vue {
     public extractAwayLocations(sheriffData){
         for (const awayInfo of sheriffData.awayLocation){
             const start = awayInfo.startDate? moment(awayInfo.startDate).tz(awayInfo.timezone).format():'';
-            this.sheriffEvents.push({
-                name: awayInfo.location.name,
-                type: 'Loaned',
-                start: start,
-                comment: awayInfo.comment
-            })
+            const currentDay = moment().tz(awayInfo.timezone).startOf("day").format();            
+            if(start && currentDay <= start){
+                this.sheriffEvents.push({
+                    name: awayInfo.location.name,
+                    type: 'Loaned',
+                    start: start,
+                    comment: awayInfo.comment
+                })
+            }
         }
     }
 

diff --git a/web/src/components/MyTeam/ViewReports.vue b/web/src/components/MyTeam/ViewReports.vue
@@ -168,7 +168,7 @@
                     <b-badge :variant="data.item['_rowVariant']" style="width:6rem;" >{{data.value}}</b-badge>                        
                 </template>
                 <template v-slot:cell(expiryDate) ="data">{{data.value | beautify-date}}</template>
-                <template v-slot:head(excluded)>Excluded</template>
+                <template v-slot:head(excluded)>Excused</template>
                 <template v-slot:cell(excluded) ="data"><b-form-checkbox v-model="data.item.excluded" @change="splitExcludedReports(false, data.item.sheriffId)"/></template>
             </b-table>
         </b-card>         
@@ -227,10 +227,10 @@
         reportFilter: string[] = []
         locationOptionsList: locationInfoType[] = [];
         
-        statusOptions = {danger:'Not Met', warning:'Expired', court:'Expiring Soon'}
+        statusOptions = {danger:'Not Taken', warning:'Expired', court:'Expiring Soon'}
 
         trainingFields = [
-            {key:"excluded",     label:"Exclude",                   thClass: 'border-bottom align-middle text-center', tdClass:'align-middle text-center', sortable: false,thStyle:'width:5%; line-height:1rem;'},
+            {key:"excluded",     label:"Excused",                   thClass: 'border-bottom align-middle text-center', tdClass:'align-middle text-center', sortable: false,thStyle:'width:5%; line-height:1rem;'},
             {key:"name",         label:"Name",                      thClass: 'border-bottom align-middle text-center', tdClass:'align-middle text-center', sortable: true, thStyle:'width:30%;'},
             {key:"trainingType", label:"Training Type",             thClass: 'border-bottom align-middle text-center', tdClass:'align-middle text-center', sortable: true, thStyle:'width:15%;'},            
             {key:"end",          label:"Completion Date",           thClass: 'border-bottom align-middle text-center', tdClass:'align-middle text-center', sortable: true, thStyle:'width:20%;'},