Sri Laxmi | MOBN-2515 | Update. Medications display to hide extra spe…

…cial characters like ,|. (#96) * Sri Laxmi | MOBN-2515 | Update. Medications display to hide extra special characters like ,|. * Sri Laxmi | MOBN-2515 | Update. Medications display to hide extra special characters like ,|.
bahmni-msf · Nov 5, 2024 · 6dbe378 · 6dbe378
1 parent ff70fb5
commit 6dbe378
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/ui/app/clinical/consultation/views/newDrugOrders.html b/ui/app/clinical/consultation/views/newDrugOrders.html
@@ -33,8 +33,8 @@ <h2 class="section-title fl">{{ ::'MEDICATION_NEW_PRESCRIPTION' | translate}}</h
                         <strong class="drug-name">{{newTreatment.getDisplayName()}}</strong>
                         <div class="dosage-frequency">
                             <span ng-show="newTreatment.getDoseAndUnits()">{{newTreatment.getDoseAndUnits()}} | </span>
-                            <span ng-show="newTreatment.getFrequency() && newTreatment.getFrequency().length">{{newTreatment.getFrequency()}} | </span>
-                            {{newTreatment.getDurationAndDurationUnits()}}
+                            <span ng-show="newTreatment.getFrequency() && newTreatment.getFrequency().length">{{newTreatment.getFrequency()}}</span>
+                            <span ng-show="newTreatment.getDurationAndDurationUnits()"> | {{newTreatment.getDurationAndDurationUnits()}}</span>
                         </div>
                     </div>
                 </div>
@@ -53,12 +53,18 @@ <h2 class="section-title fl">{{ ::'MEDICATION_NEW_PRESCRIPTION' | translate}}</h
             </div>
             <div class="dosage-details">
                 <div>
-                    <span ng-if="newTreatment.asNeeded">{{newTreatment.getAsNeededText(newTreatment.asNeeded)}}, </span>
-                    <span ng-if="newTreatment.route">{{newTreatment.route}}, </span>
-                    <span ng-hide="hideAdditionalInstructions">{{newTreatment.instructions}} |</span>
+                    <span ng-if="newTreatment.asNeeded">{{newTreatment.getAsNeededText(newTreatment.asNeeded)}}</span>
+                    <span ng-if="newTreatment.asNeeded && newTreatment.route">, </span>
+                    <span ng-if="newTreatment.route">{{newTreatment.route}}</span>
+                    <span ng-if="(newTreatment.asNeeded || newTreatment.route) && !hideAdditionalInstructions">, </span>
+                    <span ng-hide="hideAdditionalInstructions">{{newTreatment.instructions}}</span>
+                    <span ng-if="(newTreatment.asNeeded || newTreatment.route || !hideAdditionalInstructions) && newTreatment.additionalInstructions"> | </span>
                 </div>
                 <div ng-if="newTreatment.additionalInstructions">
-                    {{newTreatment.additionalInstructions}} | 
+                    {{newTreatment.additionalInstructions}} 
+                </div>
+                <div ng-if="(newTreatment.asNeeded || newTreatment.route || !hideAdditionalInstructions || newTreatment.additionalInstructions) && newTreatment.getQuantityWithUnit()">
+                     | 
                 </div>
                 <div>{{newTreatment.getQuantityWithUnit()}}</div>
             </div>

diff --git a/ui/app/clinical/consultation/views/treatmentSections/drugOrderHistory.html b/ui/app/clinical/consultation/views/treatmentSections/drugOrderHistory.html
@@ -25,8 +25,9 @@
                                         <strong class="drug-name">{{drugOrder.getDisplayName()}}</strong>
                                         <div class="dosage-frequency">
                                             <span ng-show="drugOrder.getDoseAndUnits()">{{drugOrder.getDoseAndUnits()}} | </span>
-                                            <span ng-show="drugOrder.getFrequency() && drugOrder.getFrequency().length">{{drugOrder.getFrequency()}} | </span> 
-                                            {{drugOrder.getDurationAndDurationUnits()}}</div>
+                                            <span ng-show="drugOrder.getFrequency() && drugOrder.getFrequency().length">{{drugOrder.getFrequency()}}</span> 
+                                            <span ng-show="drugOrder.getDurationAndDurationUnits()"> | {{drugOrder.getDurationAndDurationUnits()}}</span>
+                                        </div>
                                     </div>
                                 </div>
 								<div class="button-group-wrapper">
@@ -61,11 +62,15 @@
                                 </div>
                                 <div class="dosage-details">
                                     <div>
-                                        <span ng-if="drugOrder.asNeeded">{{drugOrder.getAsNeededText(drugOrder.asNeeded)}}, </span>
-                                        <span nf-if="drugOrder.route"> {{drugOrder.route}}, </span>
-                                        <span ng-hide="hideAdditionalInstructions">{{drugOrder.instructions}} |</span>
+                                        <span ng-if="drugOrder.asNeeded">{{drugOrder.getAsNeededText(drugOrder.asNeeded)}}</span>
+                                        <span ng-if="drugOrder.asNeeded && drugOrder.route">, </span>
+                                        <span ng-if="drugOrder.route">{{drugOrder.route}}</span>
+                                        <span ng-if="(drugOrder.asNeeded || drugOrder.route) && !hideAdditionalInstructions">, </span>
+                                        <span ng-hide="hideAdditionalInstructions">{{drugOrder.instructions}}</span>
+                                        <span ng-if="(drugOrder.asNeeded || drugOrder.route || !hideAdditionalInstructions) && drugOrder.additionalInstructions"> | </span>
                                     </div>
-                                    <div ng-if="drugOrder.additionalInstructions">{{drugOrder.additionalInstructions}} | </div>
+                                    <div ng-if="drugOrder.additionalInstructions">{{drugOrder.additionalInstructions}}</div>
+                                    <div ng-if="(drugOrder.asNeeded || drugOrder.route || !hideAdditionalInstructions || drugOrder.additionalInstructions) && drugOrder.getQuantityWithUnit()"> | </div>
                                     <div>{{drugOrder.getQuantityWithUnit()}}</div>
                                     <div class="footer-note">
                                         <span class="time-stamp">