Merge pull request #171 from openhealthcare/161-timeline-events-shoul…

…d-be-editable timeline clincial advice should be editable (timeline template part 2)
openhealthcare · Apr 26, 2017 · e78df26 · e78df26
2 parents 845507b + 7e1edbe
commit e78df26
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 19 deletions.
diff --git a/elcid/assets/css/elcid.css b/elcid/assets/css/elcid.css
@@ -112,3 +112,13 @@ a.list-group-item.active, a.list-group-item.active:hover, a.list-group-item.acti
 
 .btn-text-wrap {
   white-space: normal; }
+
+.no-touchevents
+.patient-timeline-discussion i.edit{
+  display:none
+}
+
+.touchevents .patient-timeline-discussion i.edit,
+.no-touchevents .patient-timeline-discussion:hover i.edit{
+  display: inline-block;
+}
diff --git a/elcid/templates/detail/inpatient.html b/elcid/templates/detail/inpatient.html
@@ -126,25 +126,31 @@ <h3>
         </div>
         <div class="col-md-9">
           <div class="patient-timeline-discussion">
-            <span ng-show="microbiology_input.initials && microbiology_input.initials.trim().length">
-              <b>By: </b> [[microbiology_input.initials]]<span ng-show="microbiology_input.discussed_with"> with [[microbiology_input.discussed_with]]</span>
-            </span>
-            <span ng-show="microbiology_input.reason_for_interaction">
-              <br />
-              <b>Reason For Interaction: </b>[[microbiology_input.reason_for_interaction]]
-            </span>
-            <span ng-show="microbiology_input.clinical_discussion">
-              <br />
-              <b>Clinical Discussion: </b>[[ microbiology_input.clinical_discussion]]
-            </span>
-            <span ng-show="microbiology_input.infection_control">
-              <br />
-              <b>Infection control: </b>[[ microbiology_input.infection_control ]]
-            </span>
-            <span ng-show="microbiology_input.agreed_plan">
-              <br />
-              <b>Plan: </b>[[ microbiology_input.agreed_plan ]]
-            </span>
+            <div class="row">
+              <div class="col-sm-10">
+                <span ng-show="microbiology_input.initials && microbiology_input.initials.trim().length">
+                  <b>By: </b> [[microbiology_input.initials]]<span ng-show="microbiology_input.discussed_with"> with [[microbiology_input.discussed_with]]</span>
+                </span>
+                <span ng-show="microbiology_input.reason_for_interaction">
+                  <br />
+                  <b>Reason For Interaction: </b>[[microbiology_input.reason_for_interaction]]
+                </span>
+                <span ng-show="microbiology_input.clinical_discussion">
+                  <br />
+                  <b>Clinical Discussion: </b>[[ microbiology_input.clinical_discussion]]
+                </span>
+                <span ng-show="microbiology_input.infection_control">
+                  <br />
+                  <b>Infection control: </b>[[ microbiology_input.infection_control ]]
+                </span>
+                <span ng-show="microbiology_input.agreed_plan">
+                  <br />
+                  <b>Plan: </b>[[ microbiology_input.agreed_plan ]]
+                </span>
+              </div>
+            <div class="col-sm-2">
+              <i class="fa fa-pencil edit pull-right pointer" ng-click="episode.recordEditor.openEditItemModal(microbiology_input, 'microbiology_input')"></i>
+            </div>
           </div>
         </div>
       </div>