Merge pull request #201 from amansinghbais/199-loaderIssue

Fixed: loader not dismissing on telecom update and truncation in facility mappings card (#199)
hotwax · Feb 19, 2024 · eeffa1f · eeffa1f
2 parents 0918b4d + e9e6a58
commit eeffa1f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/components/FacilityAddressModal.vue b/src/components/FacilityAddressModal.vue
@@ -51,7 +51,7 @@
       <ion-item>
         <ion-label :position="telecomNumberValue?.countryCode ? 'stacked' : 'floating'">{{ translate("Contact number") }}</ion-label>
         <ion-input v-model="telecomNumberValue.contactNumber">
-          <ion-text>{{ telecomNumberValue?.countryCode }}</ion-text>
+          <ion-text>{{ `${telecomNumberValue?.countryCode}-` }}</ion-text>
         </ion-input>
       </ion-item>
     </form>
@@ -180,7 +180,7 @@ export default defineComponent({
         }
       }
 
-      if(isTelecomNumberUpdated) this.saveTelecomNumber()
+      if(isTelecomNumberUpdated) await this.saveTelecomNumber()
 
       modalController.dismiss({ postalAddress })
       emitter.emit('dismissLoader')

diff --git a/src/views/AddFacilityAddress.vue b/src/views/AddFacilityAddress.vue
@@ -60,7 +60,7 @@
             <ion-item lines="none">
               <ion-label :position="countryCode ? 'stacked' : 'floating'">{{ translate("Contact number") }}</ion-label>
               <ion-input v-model="contactNumber">
-                <ion-text>{{ countryCode }}</ion-text>
+                <ion-text>{{ `${countryCode}-` }}</ion-text>
               </ion-input>
             </ion-item>
           </ion-list>

diff --git a/src/views/FacilityDetails.vue b/src/views/FacilityDetails.vue
@@ -54,7 +54,7 @@
                     <h3>{{ postalAddress.address2 }}</h3>
                     <p class="ion-text-wrap">{{ postalAddress.postalCode ? `${postalAddress.city}, ${postalAddress.postalCode}` : postalAddress.city }}</p>
                     <p class="ion-text-wrap">{{ postalAddress.countryGeoName ? `${postalAddress.stateGeoName}, ${postalAddress.countryGeoName}` : postalAddress.stateGeoName }}</p>
-                    <p class="ion-text-wrap" v-if="telecomNumber">{{ `${telecomNumber.countryCode}${telecomNumber.contactNumber}` }}</p>
+                    <p class="ion-text-wrap" v-if="telecomNumber">{{ `${telecomNumber.countryCode}-${telecomNumber.contactNumber}` }}</p>
                   </ion-label>
                 </ion-item>
                 <ion-button fill="clear" @click="openAddressModal">{{ translate("Edit") }}</ion-button>
@@ -352,6 +352,9 @@
                 <ion-card-title>
                   {{ externalMappingTypes[mapping.facilityIdenTypeId] }}
                 </ion-card-title>
+                <ion-button fill="clear" @click="copyToClipboard(mapping.idValue, 'Copied to clipboard')">
+                  <ion-icon slot="icon-only" :icon="copyOutline" />
+                </ion-button>
               </ion-card-header>
               <ion-item lines="full">
                 <ion-label>{{ translate('Identification') }}</ion-label>
@@ -372,7 +375,7 @@
                 </ion-button>
               </ion-card-header>
               <ion-item lines="full">
-                <ion-label slot="start">{{ translate('Identification') }}</ion-label>
+                <ion-label>{{ translate('Identification') }}</ion-label>
                 <ion-label slot="end">{{ current.externalId }}</ion-label>
               </ion-item>
               <!-- Using blur to remove the focus from button on click, as we need to focus the input field inside the modal opened