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

Fixed #9974 #10376

Merged
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
14 changes: 7 additions & 7 deletions src/main/webapp/inward/inward_admission.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<div class="col-md-3 p-2">
<p:outputLabel
class="m-1 form-label"
value="Admission Type :" />
value="Admission Type* :" />
<p:selectOneMenu
id="lstSelect"
value="#{admissionController.current.admissionType}"
Expand All @@ -81,7 +81,7 @@
<div class="col-md-3 p-2">
<p:outputLabel
class="m-1 form-label"
value="Room No :" />
value="Room No* :" />
<p:autoComplete
forceSelection="true"
id="cmbDoc"
Expand Down Expand Up @@ -120,7 +120,7 @@
<div class="row">
<div class="col-6">
<p:panel header="Admission Details">
<p:outputLabel value="Admitted Time"/>
<p:outputLabel value="Admitted Time*"/>
<p:datePicker value="#{admissionController.current.dateOfAdmission}"
id="admissionTimeStamp"
pattern="dd/MMM/yyyy - hh:mm:ss a"
Expand All @@ -132,7 +132,7 @@
inputStyleClass="w-100" >
</p:datePicker>

<p:outputLabel value="Consultant" ></p:outputLabel>
<p:outputLabel value="Consultant*" ></p:outputLabel>
<p:autoComplete forceSelection="true"
value="#{admissionController.current.referringConsultant}"
id="refCon"
Expand All @@ -143,7 +143,7 @@
class="w-100" placeholder="Referring Consultant"
inputStyleClass="w-100"></p:autoComplete>

<p:outputLabel value="Medical Officer"/>
<p:outputLabel value="Medical Officer*"/>
<p:autoComplete required="true"
requiredMessage="Please select referring doctor"
forceSelection="true" id="scStaff" placeholder="OPD Doctor"
Expand Down Expand Up @@ -286,7 +286,7 @@
</p:tabView>
</p:panel>
</div>
<p:panel header="Payment Detail" style="margin-top: 10px;">
<p:panel header="Payment Details" style="margin-top: 10px;">

<div class="row">
<div class="col-12">
Expand All @@ -308,7 +308,7 @@
rendered="#{admissionController.isPatientHaveALastUsedCreditCompany(admissionController.current.patient)}"
/>

<p:outputLabel value="Payment Method"/>
<p:outputLabel value="Payment Method*"/>
<p:selectOneMenu class="mx-1 w-100" styleClass="form-control w-100" id="cmbPs" value="#{admissionController.current.paymentMethod}" >
<f:selectItem itemLabel="Select" />
<f:selectItems value="#{enumController.paymentMethodForAdmission}" />
Expand Down