Skip to content

Commit

Permalink
Merge pull request #6845 from hmislk/Issue#6844
Browse files Browse the repository at this point in the history 
Issue#6844 Closes #6844
  • Loading branch information
@Irani96
Irani96 authored Aug 21, 2024
2 parents 423c74b + 59a239c commit 51adc0f
Showing 1 changed file with 18 additions and 22 deletions.
40 changes: 18 additions & 22 deletions src/main/webapp/admin/lims/report_template.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<h:panelGroup>
<p:panel header="Report">

<h:panelGrid columns="2" >

<p:selectOneMenu id="mnuCat" value="#{commonReportItemController.category}" style="width: 300px!important;">
Expand All @@ -48,21 +48,21 @@


<p:panel header="Actions" >
<p:panelGrid columns="4" >
<h:panelGrid columns="4" >
<p:commandButton ajax="false" value="Add New Label" action="#{commonReportItemController.addNewLabel()}"/>
<p:commandButton ajax="false" value="Add New Value" action="#{commonReportItemController.addNewValue()}"/>
<p:commandButton ajax="false" value="Duplicate Report" action="#{commonReportItemController.duplicate()}"/>
<p:commandButton ajax="false" rendered="false" value="Add All" action="#{commonReportItemController.addAllToCat}"/>

</p:panelGrid>
</h:panelGrid>

</p:panel>


</p:panel>

<p:panel header="Report Items List" id="pIx">
<p:panelGrid columns="3" >
<h:panelGrid columns="3" >
<h:selectOneListbox size="1" id="dtbItem" value="#{commonReportItemController.current}" style="width: 270px;" >
<f:selectItems value="#{commonReportItemController.items}" var="ii" itemLabel="#{ii.name}" itemValue="#{ii}" />
<f:ajax event="change" execute="dtbItem" render=":#{p:resolveFirstComponentWithId('pDetails',view).clientId} :#{p:resolveFirstComponentWithId('pPreview',view).clientId}"/>
Expand All @@ -71,7 +71,7 @@
<p:commandButton ajax="false" action="#{commonReportItemController.duplicateItem()}" value="Duplicate"/>
<p:commandButton ajax="false" action="#{commonReportItemController.removeItem()}" value="Remove"/>

</p:panelGrid>
</h:panelGrid>

</p:panel>

Expand All @@ -88,7 +88,7 @@

<p:panel id="pNameDetails" >

<p:panelGrid columns="2" class="w-100">
<h:panelGrid columns="2" class="w-100">
<h:outputText value="Name" />
<p:inputText
class="w-100"
Expand All @@ -113,8 +113,8 @@
</p:selectOneMenu>


</p:panelGrid>
<p:panelGrid columns="5" >
</h:panelGrid>
<h:panelGrid columns="5" >
<h:outputText value="Type"/>
<p:selectOneMenu id="cmbItemType" value="#{commonReportItemController.current.ixItemType}" >
<f:selectItem itemLabel="Label" itemValue="Label"/>
Expand All @@ -129,18 +129,15 @@
<p:selectOneMenu id="cmbValueType" value="#{commonReportItemController.current.ixItemValueType}" >
<f:selectItems value="#{enumController.investigationItemValueTypes}" ></f:selectItems>
</p:selectOneMenu>
</p:panelGrid>
<p:panelGrid columns="2" >
</h:panelGrid>
<h:panelGrid columns="2" >
<p:outputLabel value="Contents" ></p:outputLabel>
<p:inputTextarea value="#{commonReportItemController.current.description}" style="min-width: 400px!important;"></p:inputTextarea>

</p:panelGrid>


</h:panelGrid>
</p:panel>

<p:panel header="Positioning" >
<p:panelGrid columns="11">
<h:panelGrid columns="11">
<h:outputText value="Left" />
<p:inputText style="width: 80px;" autocomplete="off" id="txtLeft" value="#{commonReportItemController.current.riLeft}"/>
<div style="min-width: 20px;"></div>
Expand All @@ -153,8 +150,8 @@
<h:outputText value="Height"/>
<p:inputText style="width: 80px;" autocomplete="off" id="txtHeight" value="#{commonReportItemController.current.riHeight}"/>

</p:panelGrid>
<p:panelGrid columns="5" >
</h:panelGrid>
<h:panelGrid columns="5" >
<h:outputText value="Height PX" />
<p:inputText style="width: 50px;" autocomplete="off" id="txtHtPx"
value="#{commonReportItemController.current.htPix}"/>
Expand All @@ -164,9 +161,8 @@
value="#{commonReportItemController.current.wtPix}"/>
<div style="min-width: 20px;"></div>

</p:panelGrid>
<p:panelGrid columns="5" >

</h:panelGrid>
<h:panelGrid columns="5" >
<h:outputText value="Text-Align"/>
<p:selectOneMenu id="cmbTxtAlign" value="#{commonReportItemController.current.cssTextAlign}" >
<f:selectItem itemLabel="Left" itemValue="Left"/>
Expand All @@ -180,7 +176,7 @@
<p:selectOneMenu id="cmbTxtVerticalAlign" value="#{commonReportItemController.current.cssVerticalAlign}" >
<f:selectItems value="#{enumController.cssVerticalAlign}" ></f:selectItems>
</p:selectOneMenu>
</p:panelGrid>
</h:panelGrid>
</p:panel>


Expand All @@ -195,7 +191,7 @@
<p:inputText style="width: 50px;" autocomplete="off" id="txtFontSize" value="#{commonReportItemController.current.riFontSize}"/>

</h:panelGrid>
<h:panelGrid columns="5">
<h:panelGrid columns="5">
<h:outputText value="Font Style"/>
<p:selectOneMenu id="cmbPos" value="#{commonReportItemController.current.cssFontStyle}" >
<f:selectItem itemLabel="Normal" itemValue="Normal"/>
Expand Down

0 comments on commit 51adc0f

Please sign in to comment.