Merge pull request #171 from marzmehr/SS-746

fixing pdf report margins
bcgov · May 7, 2023 · 467f0f7 · 467f0f7
2 parents 788feeb + 5fb5cad
commit 467f0f7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/web/src/components/ShiftSchedule/DistributeSchedule.vue b/web/src/components/ShiftSchedule/DistributeSchedule.vue
@@ -122,7 +122,7 @@
         teamMembers: distributeTeamMemberInfoType[] = [];
 
         fields = [
-            {key:'myteam',  label:'Name', tdClass:'px-1 mx-0 align-middle my-team', thStyle:'text-align: center; font-size: 8pt; width: 11rem;'},
+            {key:'myteam',  label:'Name', tdClass:'px-1 mx-0 align-middle my-team', thStyle:'text-align: center; font-size: 8pt; width: 7.5rem;'},
             {key:'Sun',     label:'',     tdClass:'px-1 mx-0 py-0', thStyle:'text-align: center; font-size: 7pt; width: 6.5rem;'},
             {key:'Mon',     label:'',     tdClass:'px-1 mx-0 py-0', thStyle:'text-align: center; font-size: 7pt; width: 6.5rem;'},
             {key:'Tue',     label:'',     tdClass:'px-1 mx-0 py-0', thStyle:'text-align: center; font-size: 7pt; width: 6.5rem;'},

diff --git a/web/src/components/ShiftSchedule/components/DailySchedule.vue b/web/src/components/ShiftSchedule/components/DailySchedule.vue
@@ -97,7 +97,7 @@
                         <b v-if="duty.isOvertime">*</b>                            
                         <b> {{duty.startTime}}-{{duty.endTime}}</b>  
                         <span > {{duty.dutySubType}} </span>
-                        {{ duty.dutyType }}
+                        ({{ duty.dutyType.replace('Role','').replace('Assignment','').replace('EscortRun','Transport') }})
                     </div>                            
                 </div>
             </template>

diff --git a/web/src/filters/index.ts b/web/src/filters/index.ts
@@ -338,7 +338,7 @@ Vue.filter('printPdf', function(html, pageFooterLeft, pageFooterRight){
             `th {border: 3px solid black;}`+
             `table.printer td:has(.middle-text){ vertical-align: middle !important;}`+
             `td {height: 2.5rem;border: 3px solid; width: 6.5rem;}`+
-            `td.my-team {height: 2.5rem;border: 3px solid; width: 11rem !important;}`+
+            `td.my-team {height: 2.5rem;border: 3px solid; width: 7rem !important;}`+
             `td.my-notes {height: 2.5rem;border: 3px solid; width: 17rem !important;}`+
             `.bg-spl-leave {background-color: #ffee07;}`+
             `.bg-a-l-leave {background-color: #007bff;}`+