Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BAH-3334 | Fix. Miss CSS Stylesheet In formPrint.html #983

Merged
merged 1 commit into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ui/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ module.exports = function (grunt) {
usemin: {
html: [
'<%= yeoman.dist %>/**/index.html',
'<%= yeoman.dist %>/clinical/common/views/formPrint.html',
'<%= yeoman.dist %>/clinical/common/views/visitTabPrint.html',
'<%= yeoman.dist %>/clinical/dashboard/views/dashboardPrint.html',
'<%= yeoman.dist %>/common/displaycontrols/prescription/views/prescription.html'
Expand Down
102 changes: 55 additions & 47 deletions ui/app/clinical/common/views/formPrint.html
Original file line number Diff line number Diff line change
@@ -1,53 +1,61 @@
<link rel="stylesheet" href="../styles/clinicalPrint.css" media="print"/>
<div class="print-wrapper">
<div class="print-logo-plus-text">
<img class="print-logo" width="125px" ng-if="printConfig.logo" ng-src="{{printConfig.logo}}" alt="logo"/>
<h1 class="print-logo-text">{{printConfig.title}}</h1>
<div class="print-right"></div>
</div>
<div class="clinic-info">
<span> {{printConfig.header}}</span>
</div>
<ng-include src="patientInfoPrint.html"></ng-include>
<div class="sections-group">
<div class="section">
<section class="block observation dashboard-section" id="observationSection">
<ul bm-gallery access-impression="true">
<section class="block " ng-class="::{'hidden-print': noObsMessage}">
<h2 class="tableMargin"
ng-class="::{'section-title': !isFulfilmentDisplayControl, 'form-field': isFulfilmentDisplayControl}">{{::title |
translate}}</h2>
<div class="concept-set-container-view">
<section class="block hierarchy">
<ul class="form-field" ng-if="bahmniObservations.length > 0">
<li class="tableMargin" ng-repeat="obsGroup in ::bahmniObservations">
<span class="tree-list-item row-click toggle-container" toggle="obsGroup.isOpen">
<span class="obs-date" ng-if="obsGroup.value.length > 0">
{{::obsGroup.date | bahmniDateTime}}
</span>
</span>
<ul class="print-observations visible-print">
<li class="tableBorder" ng-repeat="observation in ::obsGroup.value track by $index">
<ul>
<show-observation show-details-button="::config.showDetailsButton" patient="::patient"
observation="::observation"
level="2">
</show-observation>
<!DOCTYPE html>
<html lang="en">
<head>
<title>Form Print</title>
<link rel="stylesheet" href="../styles/clinicalPrint.css" media="print"/>
</head>
<body>
<div class="print-wrapper">
<div class="print-logo-plus-text">
<img class="print-logo" width="125px" ng-if="printConfig.logo" ng-src="{{printConfig.logo}}" alt="logo"/>
<h1 class="print-logo-text">{{printConfig.title}}</h1>
<div class="print-right"></div>
</div>
<div class="clinic-info">
<span> {{printConfig.header}}</span>
</div>
<ng-include src="patientInfoPrint.html"></ng-include>
<div class="sections-group">
<div class="section">
<section class="block observation dashboard-section" id="observationSection">
<ul bm-gallery access-impression="true">
<section class="block " ng-class="::{'hidden-print': noObsMessage}">
<h2 class="tableMargin"
ng-class="::{'section-title': !isFulfilmentDisplayControl, 'form-field': isFulfilmentDisplayControl}">{{::title |
translate}}</h2>
<div class="concept-set-container-view">
<section class="block hierarchy">
<ul class="form-field" ng-if="bahmniObservations.length > 0">
<li class="tableMargin" ng-repeat="obsGroup in ::bahmniObservations">
<span class="tree-list-item row-click toggle-container" toggle="obsGroup.isOpen">
<span class="obs-date" ng-if="obsGroup.value.length > 0">
{{::obsGroup.date | bahmniDateTime}}
</span>
</span>
<ul class="print-observations visible-print">
<li class="tableBorder" ng-repeat="observation in ::obsGroup.value track by $index">
<ul>
<show-observation show-details-button="::config.showDetailsButton" patient="::patient"
observation="::observation"
level="2">
</show-observation>
</ul>
</li>
</ul>
</li>
</ul>
</li>
</ul>
<div ng-if="::noObsMessage">
<div class="placeholder-text" ng-if="::!message"><p translate="DISPLAY_CONTROL_ERROR_MESSAGE_KEY"
translate-values="::{displayControl : '{{title | translate}}'}"></p>
</div>
<div class="placeholder-text" ng-if="::message">{{::message|translate}}</div>
<div ng-if="::noObsMessage">
<div class="placeholder-text" ng-if="::!message">
<p translate="DISPLAY_CONTROL_ERROR_MESSAGE_KEY" translate-values="::{displayControl : '{{title | translate}}'}"></p>
</div>
<div class="placeholder-text" ng-if="::message">{{::message|translate}}</div>
</div>
</section>
</div>
</section>
</div>
</ul>
</section>
</ul>
</section>
</div>
</div>
</div>
</div>
</body>
</html>
Loading