Merge pull request #16 from PiusKariuki/chore/translate-supplemental-…

…and-local-cards chore: translate supplemental and local registration cards
IntelliSOFT-Consulting · Nov 27, 2024 · 81dcdd1 · 81dcdd1
2 parents 1236516 + c7b0a44
commit 81dcdd1
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 36 deletions.
diff --git a/openmrs/apps/registration/registrationCardLayout/css/print.css b/openmrs/apps/registration/registrationCardLayout/css/print.css
@@ -33,6 +33,17 @@ h1, h2, h3 {
 /* line 24, print.scss */
 .registrationCard-print-table td.registrationCard-photo {
   padding-top: 2px;
+  width: 100%;
+  height: auto;
+  object-fit: cover;
+}
+
+.registration-img{
+  width: 100% !important;
+  height: auto !important;
+  object-fit: contain !important;
+  margin: 0px auto 0px auto !important;
+  align-self: center;
 }
 
 /* line 27, print.scss */
@@ -97,6 +108,20 @@ h1, h2, h3 {
   height: 12mm;
 }
 
+
+.institute-name-wrapper{
+  width: 100%;
+  padding-left: 2rem;
+}
+
+.institute-name{
+  text-align: center;
+  white-space: nowrap;
+  font-size: 20px;
+  font-weight: 700;
+  width: 100%;
+}
+
 /* line 71, print.scss */
 .registrationCard-location {
   padding: 5px 8px 8px 8px;

diff --git a/openmrs/apps/registration/registrationCardLayout/print.html b/openmrs/apps/registration/registrationCardLayout/print.html
@@ -19,7 +19,7 @@ <h3 class="print-table-header">Notice</h3>
                                 {{ "REGISTRATION_TIMINGS_TEXT_KEY" | translate }}
                             </li>
                             <li>
-                               {{ "REGISTRATION_OPD_DAYS_TEXT_KEY" | translate }}
+                                {{ "REGISTRATION_OPD_DAYS_TEXT_KEY" | translate }}
                             </li>
                             <li>
                                 {{ "REGISTRATION_SUNDAYS_HOLIDAY_TEXT_KEY" | translate }}
@@ -40,23 +40,28 @@ <h3 class="print-table-header">Caution</h3>
                 <tr>
                     <td class="logo">
                         <p>
-                            <img src="/bahmni_config/openmrs/apps/registration/registrationCardLayout/images/bahmni-icon.png" style="width: 12mm; height: 12mm; "/>
+                            <img
+                                    src="/bahmni_config/openmrs/apps/registration/registrationCardLayout/images/bahmni-icon.png"
+                                    style="width: 100%; height: auto;"
+                            />
                         </p>
                     </td>
-                    <td class="print-table-right-header">
-                        <h3>
-                        {{ "REGISTRATION_INSTITUTE_NAME_TEXT_KEY" | translate }}
-                        </h3>
-                        <h3 class="print-center">{{ "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY" |  translate }}</h3>
-                    </td>
-                    <td class="registrationCard-photo">
-                        <img ng-src="{{patient.image}}" style="width: 20mm; height: 20mm; "
-                             onerror="this.onerror=null;this.src='../images/blank.jpeg';"/>
+                </tr>
+                <tr class="institute-name-wrapper">
+                    <td >
+                        <p class="institute-name">
+                            {{ "REGISTRATION_INSTITUTE_NAME_TEXT_KEY" | translate }}
+                        </p>
                     </td>
                 </tr>
                 <tr>
-                    <td colspan="3" class="print-center registrationCard-location">
-                    {{ "REGISTRATION_INSTITUTE_ADDRESS" | translate }}
+                    <td class="">
+                        <img
+                                class="registration-img"
+                                alt="https://cdn.pixabay.com/photo/2016/04/01/10/11/avatar-1299805_1280.png"
+                                ng-src="{{patient.image}}"
+                                onerror="this.onerror=null;this.src='../images/blank.jpeg';"
+                        />
                     </td>
                 </tr>
             </table>

diff --git a/openmrs/apps/registration/registrationCardLayout/print_local.html b/openmrs/apps/registration/registrationCardLayout/print_local.html
@@ -40,23 +40,28 @@ <h3 class="print-table-header">Caution</h3>
                 <tr>
                     <td class="logo">
                         <p>
-                            <img src="/bahmni_config/openmrs/apps/registration/registrationCardLayout/images/bahmni-icon.png" style="width: 12mm; height: 12mm; "/>
+                            <img
+                                src="/bahmni_config/openmrs/apps/registration/registrationCardLayout/images/bahmni-icon.png"
+                                style="width: 100%; height: auto;"
+                            />
                         </p>
                     </td>
-                    <td class="print-table-right-header">
-                        <h3>
+                </tr>
+                <tr class="institute-name-wrapper">
+                    <td >
+                        <p class="institute-name">
                             {{ "REGISTRATION_INSTITUTE_NAME_TEXT_KEY" | translate }}
-                        </h3>
-                        <h3 class="print-center">{{ "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY" |  translate }}</h3>
-                    </td>
-                    <td class="registrationCard-photo">
-                        <img ng-src="{{patient.image}}" style="width: 20mm; height: 20mm; "
-                             onerror="this.onerror=null;this.src='../images/blank.jpeg';"/>
+                        </p>
                     </td>
                 </tr>
                 <tr>
-                    <td colspan="3" class="print-center registrationCard-location">
-                        {{ "REGISTRATION_INSTITUTE_ADDRESS" | translate }}
+                    <td class="">
+                        <img
+                            class="registration-img"
+                            alt="https://cdn.pixabay.com/photo/2016/04/01/10/11/avatar-1299805_1280.png"
+                            ng-src="{{patient.image}}"
+                            onerror="this.onerror=null;this.src='../images/blank.jpeg';"
+                        />
                     </td>
                 </tr>
             </table>

diff --git a/openmrs/apps/registration/supplementalPaperLayout/print.html b/openmrs/apps/registration/supplementalPaperLayout/print.html
@@ -4,48 +4,48 @@
     </style>
     <div class="row">
         <div class="left">
-            <span class="label">ओपीडी क्र.:</span>
+            <span class="label">OPD No.:</span>
             <span></span>
         </div>
         <div class="right">
-            <span class="label">दिनांक:</span>
+            <span class="label">Date:</span>
             <span>{{today | date:'dd/MM/yyyy'}}</span>
         </div>
     </div>
     <div class="row">
         <div class="left">
-            <span class="label">पंजी. क्र.:</span>
+            <span class="label">Registration No.:</span>
             <span>{{patient.primaryIdentifier.identifier}}</span>
         </div>
         <div class="right">
-            <span class="label">गाँव:</span>
+            <span class="label">Village:</span>
             <span>{{patient.address.cityVillage}}</span>
         </div>
     </div>
     <div class="row">
         <div class="left">
-            <span class="label">नाम:</span>
+            <span class="label">Name:</span>
             <span>{{patient.fullNameLocal() || patient.name}}</span>
         </div>
         <div class="right">
-            <span class="label">जिला:</span>
+            <span class="label">District:</span>
             <span>{{patient.address.countyDistrict}}</span>
         </div>
     </div>
     <div class="row">
         <div class="left">
-            <span class="label">पिता/पति का नाम:</span>
+            <span class="label">Father's/Husband's Name:</span>
             <span>{{patient.primaryRelative}}</span>
         </div>  
         <div class="right">
-            <span class="label">उम्र/लिंग:</span>
+            <span class="label">Age/Gender:</span>
             <span>{{patient.age.years || "0"}}</span>
             <span ng-show="patient.gender">/ {{patient.gender}}</span>
         </div>
     </div>
     <div class="row">
         <div class="left">
-            <span class="label">वज़न:</span>
+            <span class="label">Weight:</span>
             <span>{{obs.WEIGHT}}</span>
         </div>
     </div>

diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json
@@ -16,13 +16,14 @@
   "REGISTRATION_OPD_DAYS_TEXT_KEY" : "OPD days are on Monday, Wednesday, Friday.",
   "REGISTRATION_SUNDAYS_HOLIDAY_TEXT_KEY": "Sundays are holidays.",
   "REGISTRATION_SMOKING_INJURIOUS_TEXT_KEY" : "Smoking, Tobacco chewing can cause cancer, heart diseases and ASTHMA.",
-  "REGISTRATION_INSTITUTE_NAME_TEXT_KEY": "Jan Swasthya Sahyog",
+  "REGISTRATION_INSTITUTE_NAME_TEXT_KEY": "Bahir-Dar Specialty Eye Centre",
   "REGISTRATION_INSTITUTE_REGISTERED_TEXT_KEY": "(Registered)",
-  "REGISTRATION_INSTITUTE_ADDRESS": "Ganiyari, District - Bilaspur",
+  "REGISTRATION_INSTITUTE_ADDRESS": "Bahir-Dar Specialty Eye Centre",
   "FEE_INFORMATION_LOCALE_KEY": "Fee Information",
   "NUTRITIONAL_VALUES_LOCALE_KEY": "Nutritional Values",
   "NEXTOFKIN_INFO_KEY": "Next of Kin Details",
   "REGISTRATION_PRINT_WITH_BARCODE": "Bar<u>c</u>ode Print",
   "REGISTRATION_EMAIL_ERROR_KEY": "Please enter a valid email",
-  "OTHER_OCCUPATION_INFO_KEY": "Specify Patient Occupation"
+  "OTHER_OCCUPATION_INFO_KEY": "Specify Patient Occupation",
+  "CLINICAL_YEARS_TRANSLATION_KEY": "Clinical years"
 }