Skip to content

B
business-java
Commit 22119679 authored by aali's avatar aali
Browse files
Options

Updated source 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106461 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f743895c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 686 additions and 263 deletions
webitm-adm/ibase/webitm/ejb/adm/PerkClaimIC.java
View file @ 22119679
......@@ -457,7 +457,16 @@ public class PerkClaimIC extends ValidatorEJB implements PerkClaimICLocal, PerkC
errFields.add( childNodeName.toLowerCase() );
}
}
//Modified by Ahmed on 27/Jul/2017[To validate when payroll_voucher is P and adjust_loan is yes][start]
String adjustLoan = checkNull(genericUtility.getColumnValue("adjust_loan", currDom));
System.out.println("payrollvoucher>>"+payrollVoucher);
System.out.println("adjustLoan>>"+adjustLoan);
if("P".equalsIgnoreCase(payrollVoucher) && !"N".equalsIgnoreCase(adjustLoan))
{
errList.add("VMPRKPAYV1");
errFields.add(childNodeName.toLowerCase());
}
//Modified by Ahmed on 27/Jul/2017[To validate when payroll_voucher is P and adjust_loan is yes][end]
}
//Modified By Hemlata on [29/05/2015][To validate payroll period in period table][Start]
else if ( "payroll_prd".equalsIgnoreCase( childNodeName ) )
......
webitm-adm/ibase/webitm/ejb/adm/PerkClaimProcess.java
View file @ 22119679
......@@ -1989,8 +1989,8 @@ public class PerkClaimProcess extends ValidatorEJB implements
}
}
}
System.out.println("site_code__from...");
if (childNodeName.equalsIgnoreCase("site_code__from")) {
//System.out.println("site_code__from...");
else if (childNodeName.equalsIgnoreCase("site_code__from")) {
int level = 0;
......@@ -2070,6 +2070,24 @@ public class PerkClaimProcess extends ValidatorEJB implements
}
}
//Modified by Ahmed on 27/Jul/2017[To validate when payroll_voucher is P and adjust_loan is yes][start]
else if("payroll_voucher".equalsIgnoreCase(childNodeName))
{
payrollvoucher = checkNull(genericUtility.getColumnValue("payroll_voucher", dom1, objContext));
adjustLoan = checkNull(genericUtility.getColumnValue("adjust_loan", dom1, objContext));
System.out.println("payrollvoucher>>"+payrollvoucher);
System.out.println("adjustLoan>>"+adjustLoan);
if("P".equalsIgnoreCase(payrollvoucher) && !"N".equalsIgnoreCase(adjustLoan))
{
errList.add("VMPRKPAYV1");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VMPRKPAYV1");
if (msgType.equalsIgnoreCase("E")) {
break;
}
}
}
//Modified by Ahmed on 27/Jul/2017[To validate when payroll_voucher is P and adjust_loan is yes][end]
}
System.out.println("outside for loop...");
}
......
webitm-adm/module-resource/SQL/A16JSUN009.sql 0 → 100644
View file @ 22119679
insert into obj_itemchange (obj_name,form_no,field_name,mandatory) values ('pfno_change','1','chg_type',null);
Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('pfno_change','1','itm_defaultedit',null);
alter table pfno_change add chg_type char(1);
alter table pfno_change add uan_no varchar2(20);
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values ('VTBLKUANNO','UAN Number','UAN number should not be left blank ','E','Y',null,null,null,FN_SYSDATE(),'BASE','BASE',null,null);
commit;
\ No newline at end of file
webitm-adm/module-resource/SQL/ADM-RCP-DATA-DML.SQL
View file @ 22119679
......@@ -19652,3 +19652,7 @@ INSERT INTO PAYRPARM (PRD_CODE,VAR_NAME,VAR_TYPE,VAR_VALUE,DESCR,VAR_SUBS,CHG_DA
COMMIT;
--Modified by Ahmed on 03/May/2017[end]
--Modified by Ahmed on 27/Jul/2017[start]
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values ('VMPRKPAYV1','Invalid Adjust Loan','Adjust Loan should be No when Payroll is selected','E',null,null,null,null,FN_SYSDATE(),'BASE','BASE',null,null);
--Modified by Ahmed on 27/Jul/2017[end]
\ No newline at end of file
webitm-adm/module-resource/metadata/pfno_change11.xml
View file @ 22119679
......@@ -39,7 +39,7 @@
<color>536870912</color>
</Summary>
<Footer>
<height>0</height>
<height>3</height>
<color>536870912</color>
</Footer>
<Detail>
......@@ -104,8 +104,15 @@
<name>site_code</name>
<dbname>pfno_change.site_code</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;pfno_change&quot; ) COLUMN(NAME=&quot;pfno_change.tran_id&quot;) COLUMN(NAME=&quot;pfno_change.tran_date&quot;) COLUMN(NAME=&quot;pfno_change.emp_code&quot;) COLUMN(NAME=&quot;pfno_change.pf_no&quot;) COLUMN(NAME=&quot;pfno_change.chg_date&quot;) COLUMN(NAME=&quot;pfno_change.chg_user&quot;) COLUMN(NAME=&quot;pfno_change.chg_term&quot;) COLUMN(NAME=&quot;pfno_change.site_code&quot;)WHERE( EXP1 =&quot;~&quot;PFNO_CHANGE~&quot;.~&quot;SITE_CODE~&quot;&quot; OP =&quot;=&quot; EXP2 =&quot;:as_sitecode&quot; ) ) ARG(NAME = &quot;as_sitecode&quot; TYPE = string) </retrieve>
<update>pfno_change</update>
<table_column>
<type size="20">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>uan_no</name>
<dbname>pfno_change.uan_no</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;pfno_change&quot; ) COLUMN(NAME=&quot;pfno_change.tran_id&quot;) COLUMN(NAME=&quot;pfno_change.tran_date&quot;) COLUMN(NAME=&quot;pfno_change.emp_code&quot;) COLUMN(NAME=&quot;pfno_change.pf_no&quot;) COLUMN(NAME=&quot;pfno_change.chg_date&quot;) COLUMN(NAME=&quot;pfno_change.chg_user&quot;) COLUMN(NAME=&quot;pfno_change.chg_term&quot;) COLUMN(NAME=&quot;pfno_change.site_code&quot;) COLUMN(NAME=&quot;pfno_change.uan_no&quot;)WHERE( EXP1 =&quot;~&quot;PFNO_CHANGE~&quot;.~&quot;SITE_CODE~&quot;&quot; OP =&quot;=&quot; EXP2 =&quot;:as_sitecode&quot; ) ) ARG(NAME = &quot;as_sitecode&quot; TYPE = string) </retrieve>
<update>PFNO_CHANGE</update>
<updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace>
<argument>
......@@ -147,10 +154,10 @@
<text>Tran Date</text>
<border>6</border>
<color>33554432</color>
<x>69</x>
<x>70</x>
<y>2</y>
<height>16</height>
<width>66</width>
<width>65</width>
<html>
<valueishtml>0</valueishtml>
</html>
......@@ -175,7 +182,7 @@
<text>Emp Code</text>
<border>6</border>
<color>33554432</color>
<x>138</x>
<x>137</x>
<y>2</y>
<height>16</height>
<width>96</width>
......@@ -203,7 +210,7 @@
<text>Pf No</text>
<border>6</border>
<color>33554432</color>
<x>236</x>
<x>235</x>
<y>2</y>
<height>16</height>
<width>66</width>
......@@ -231,7 +238,7 @@
<text>Site Code</text>
<border>6</border>
<color>33554432</color>
<x>304</x>
<x>381</x>
<y>2</y>
<height>16</height>
<width>66</width>
......@@ -259,7 +266,7 @@
<text>Chg Date</text>
<border>6</border>
<color>33554432</color>
<x>372</x>
<x>449</x>
<y>2</y>
<height>16</height>
<width>78</width>
......@@ -287,7 +294,7 @@
<text>Chg User</text>
<border>6</border>
<color>33554432</color>
<x>452</x>
<x>529</x>
<y>2</y>
<height>16</height>
<width>75</width>
......@@ -315,7 +322,7 @@
<text>Chg Term</text>
<border>6</border>
<color>33554432</color>
<x>529</x>
<x>606</x>
<y>2</y>
<height>16</height>
<width>76</width>
......@@ -337,6 +344,34 @@
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>2</alignment>
<text>Uan No</text>
<border>6</border>
<color>33554432</color>
<x>303</x>
<y>2</y>
<height>16</height>
<width>76</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>uan_no_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>67108864</color>
</background>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>1</id>
......@@ -419,7 +454,7 @@
<tabsequence>30</tabsequence>
<border>5</border>
<color>33554432</color>
<x>138</x>
<x>137</x>
<y>1</y>
<height>16</height>
<width>96</width>
......@@ -457,7 +492,7 @@
<tabsequence>40</tabsequence>
<border>5</border>
<color>33554432</color>
<x>236</x>
<x>235</x>
<y>1</y>
<height>16</height>
<width>66</width>
......@@ -492,10 +527,10 @@
<band>Detail</band>
<id>8</id>
<alignment>0</alignment>
<tabsequence>50</tabsequence>
<tabsequence>60</tabsequence>
<border>5</border>
<color>33554432</color>
<x>305</x>
<x>381</x>
<y>1</y>
<height>16</height>
<width>66</width>
......@@ -529,10 +564,10 @@
<band>Detail</band>
<id>5</id>
<alignment>0</alignment>
<tabsequence>60</tabsequence>
<tabsequence>70</tabsequence>
<border>5</border>
<color>33554432</color>
<x>372</x>
<x>449</x>
<y>1</y>
<height>16</height>
<width>78</width>
......@@ -567,10 +602,10 @@
<band>Detail</band>
<id>6</id>
<alignment>0</alignment>
<tabsequence>70</tabsequence>
<tabsequence>80</tabsequence>
<border>5</border>
<color>33554432</color>
<x>452</x>
<x>529</x>
<y>1</y>
<height>16</height>
<width>75</width>
......@@ -605,10 +640,10 @@
<band>Detail</band>
<id>7</id>
<alignment>0</alignment>
<tabsequence>80</tabsequence>
<tabsequence>90</tabsequence>
<border>5</border>
<color>33554432</color>
<x>529</x>
<x>606</x>
<y>1</y>
<height>16</height>
<width>76</width>
......@@ -639,6 +674,42 @@
<color>16777215</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>9</id>
<alignment>0</alignment>
<tabsequence>50</tabsequence>
<border>0</border>
<color>33554432</color>
<x>303</x>
<y>1</y>
<height>16</height>
<width>76</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>uan_no</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>upper</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>16777215</color>
</background>
</ColumnObject>
<HtmlTable>
<border>1</border>
</HtmlTable>
......
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