Revert " TEST เอาจาก STD ไปทดสอบของ DHAS"

This reverts commit 62c55bbf.
parent 62c55bbf
...@@ -73,10 +73,6 @@ ...@@ -73,10 +73,6 @@
<parameter name="GROUPBY" isForPrompting="false" class="java.lang.String"> <parameter name="GROUPBY" isForPrompting="false" class="java.lang.String">
<parameterDescription><![CDATA[component]]></parameterDescription> <parameterDescription><![CDATA[component]]></parameterDescription>
</parameter> </parameter>
<parameter name="CONDITION" isForPrompting="false" class="java.lang.String">
<parameterDescription><![CDATA[component]]></parameterDescription>
<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
</parameter>
<field name="tleave_summary__employeeid" class="java.lang.String"> <field name="tleave_summary__employeeid" class="java.lang.String">
<fieldDescription><![CDATA[Field returned by tleave_summary__employeeid]]></fieldDescription> <fieldDescription><![CDATA[Field returned by tleave_summary__employeeid]]></fieldDescription>
...@@ -878,11 +874,7 @@ ...@@ -878,11 +874,7 @@
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single"> <textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single">
<font fontName="Cordia New" pdfFontName="CORDIA.TTF" size="24" isBold="true" isItalic="false" isUnderline="false" isPdfEmbedded ="true" pdfEncoding ="Identity-H" isStrikeThrough="false" /> <font fontName="Cordia New" pdfFontName="CORDIA.TTF" size="24" isBold="true" isItalic="false" isUnderline="false" isPdfEmbedded ="true" pdfEncoding ="Identity-H" isStrikeThrough="false" />
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{CONDITION}.indexOf("branch = ") > -1 ? <textFieldExpression class="java.lang.String"><![CDATA[$P{COMPANY}]]></textFieldExpression>
$P{LANG}.equalsIgnoreCase("tha")?
$F{mbranch__tdesc}:$F{mbranch__edesc}
:
$P{COMPANY}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" > <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None" hyperlinkTarget="Self" >
<reportElement <reportElement
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
<FIELD>dateid</FIELD> <FIELD>dateid</FIELD>
<FIELD>lv_type</FIELD> <FIELD>lv_type</FIELD>
<FIELD>companyid</FIELD> <FIELD>companyid</FIELD>
<FIELD>branch</FIELD>
<ORDER> <ORDER>
<FIELD>employeeid</FIELD> <FIELD>employeeid</FIELD>
<FIELD>dateid</FIELD> <FIELD>dateid</FIELD>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment