Commit 1c7f71e0 authored by vkadam's avatar vkadam

SUN source merging


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104793 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a78db01b
......@@ -2919,106 +2919,3 @@ ALTER TABLE EMP_EMPLOY_EVENTS ADD CONSTRAINT FK_EMPEVENTS_BU_CODE FOREIGN KEY (
--------------- DDL from ADM-RCP-DDL-V33.SQL.End -------
------ ADM-RCP-DDL-V34 (Piyush).SQL.Start ------
SET DEFINE OFF
--- Request ID: A16ESUN007.SQL.Start ---
ALTER TABLE ITPROJ_CALCHDR ADD CALC_BASE_CRITERIA CHAR(1);
ALTER TABLE IT_CALCHDR ADD CALC_BASE_CRITERIA CHAR(1);
--- Request ID: A16ESUN007.SQL.End ---
--- Request ID: A16ESUN009.SQL.Start ---
--- Request ID: A16ESUN009.SQL.End ---
--- Request ID: A16HSUN001-1.sql.Start ---
ALTER TABLE EMPLOYEE ADD MOTHER_TONGUE VARCHAR2(10);
ALTER TABLE EMPLOYEE ADD CAST_CATEGORY CHAR(5);
ALTER TABLE EMPLOYEE ADD COUNT_CODE__BIRTH CHAR(5);
ALTER TABLE EMPLOYEE ADD JOB_TITLE VARCHAR2(200);
ALTER TABLE EMPLOYEE ADD EMP_ID_EXTERNAL VARCHAR2(20);
ALTER TABLE EMPQUAL ADD COURSE_TYPE CHAR(5);
ALTER TABLE EMPQUAL ADD COURSE_DURATION NUMBER(3);
ALTER TABLE EMPQUAL ADD COUNT_CODE__QUAL CHAR(5);
ALTER TABLE EMPEXPERIENCE ADD COUNT_CODE__WORK CHAR(5);
ALTER TABLE EMPLOYEE_DET_CHANGE ADD MOTHER_TONGUE__O VARCHAR2(10);
ALTER TABLE EMPLOYEE_DET_CHANGE ADD MOTHER_TONGUE VARCHAR2(10);
ALTER TABLE EMPLOYEE_DET_CHANGE ADD CAST_CATEGORY__O CHAR(5);
ALTER TABLE EMPLOYEE_DET_CHANGE ADD CAST_CATEGORY CHAR(5);
ALTER TABLE EMPLOYEE_DET_CHANGE ADD COUNT_CODE__BIRTH_O CHAR(5);
ALTER TABLE EMPLOYEE_DET_CHANGE ADD COUNT_CODE__BIRTH CHAR(5);
ALTER TABLE EMPLOYEE_DET_CHANGE ADD JOB_TITLE_O VARCHAR2(200);
ALTER TABLE EMPLOYEE_DET_CHANGE ADD JOB_TITLE VARCHAR2(200);
ALTER TABLE EMPLOYEE_DET_CHANGE ADD EMP_ID_EXTERNAL_O VARCHAR2(20);
ALTER TABLE EMPLOYEE_DET_CHANGE ADD EMP_ID_EXTERNAL VARCHAR2(20);
CREATE OR REPLACE FUNCTION FN_GET_COUNT_DESCR(AS_COUNT_CODE In CHAR)
RETURN VARCHAR2 IS COUNT_DESCR VARCHAR2(200);
BEGIN
COUNT_DESCR := '';
BEGIN
SELECT DESCR INTO COUNT_DESCR FROM COUNTRY WHERE COUNT_CODE = AS_COUNT_CODE;
EXCEPTION WHEN NO_DATA_FOUND THEN
COUNT_DESCR := '';
END;
RETURN COUNT_DESCR;
END;
/
--- Request ID: A16HSUN001-1.sql.End ---
--- Request ID: A16HSUN001-2.sql.Start ---
ALTER TABLE EMP_STATUSCHG ADD REASON_CODE CHAR(5);
ALTER TABLE EMP_EMPLOY_EVENTS ADD REASON_CODE CHAR(5);
ALTER TABLE EMP_EMPLOY_EVENTS ADD JOB_TITLE_FR VARCHAR2(200);
ALTER TABLE EMP_EMPLOY_EVENTS ADD JOB_TITLE_TO VARCHAR2(200);
ALTER TABLE ORG_STRUCTURE ADD DEPT_CODE CHAR(5);
--- Request ID: A16HSUN001-2.sql.End ---
--- Request ID: A16HSUN001-3.sql.Start ---
--- Request ID: A16HSUN001-3.sql.End ---
--- Request ID: A16HSUN001-4.sql.Start ---
--- Request ID: A16HSUN001-4.sql.End ---
--- Request ID: A16HSUN001-5.sql.Start ---
--- Request ID: A16HSUN001-5.sql.End ---
--- Request ID: office-sql.Start ---
--- Request ID: office-sql.End ---
--- Request ID:A16HSUN006. Migration of IT Declaration to RCP and IT Declaration through Upload START ---
--alter table for adding seq_no in emp_itdecl_hdr table--
alter table emp_itdecl_hdr add seq_no number(2) default 1 not null;
--drop index emp_itdecl_hdr_aeqd on table emp_itdecl_hdr --
drop index emp_itdecl_hdr_aeqd ;
commit;
--create index for AEQDS on emp_itdecl_hdr table (ACCT_PRD, EMP_CODE__DECL, QTR_NO, DECL_TYPE, SEQ_NO)--
create unique index emp_itdecl_hdr_aeqd on emp_itdecl_hdr (acct_prd asc, emp_code__decl asc, qtr_no asc, decl_type asc, seq_no asc);
commit;
--- Request ID:A16HSUN006. Migration of IT Declaration to RCP and IT Declaration through Upload END ---
------ ADM-RCP-DDL-V34 (Piyush).SQL.End ------
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -16,9 +16,7 @@ table(column=(type=char(10) update=yes updatewhereclause=yes key=yes name=emp_co
column=(type=char(15) update=yes updatewhereclause=yes name=chg_term dbname="empexperience.chg_term" )
column=(type=char(10) update=yes updatewhereclause=yes name=chg_user dbname="empexperience.chg_user" )
column=(type=decimal(0) update=yes updatewhereclause=yes name=print_seq dbname="empexperience.print_seq" initial="0" )
column=(type=char(5) update=yes updatewhereclause=yes name=count_code__work dbname="empexperience.count_code__work" )
column=(type=char(4000) updatewhereclause=yes name=work_country_descr dbname="work_country_descr" )
retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"empexperience~" ) COLUMN(NAME=~"empexperience.emp_code~") COLUMN(NAME=~"empexperience.organisation~") COLUMN(NAME=~"empexperience.designation~") COLUMN(NAME=~"empexperience.from_date~") COLUMN(NAME=~"empexperience.to_date~") COLUMN(NAME=~"empexperience.gross_amt~") COLUMN(NAME=~"empexperience.curr_code~") COLUMN(NAME=~"empexperience.chg_date~") COLUMN(NAME=~"empexperience.chg_term~") COLUMN(NAME=~"empexperience.chg_user~") COLUMN(NAME=~"empexperience.print_seq~") COLUMN(NAME=~"empexperience.count_code__work~") COMPUTE(NAME=~"FN_GET_COUNT_DESCR(empexperience.count_code__work) as work_country_descr~")WHERE( EXP1 =~"empexperience.emp_code~" OP =~"=~" EXP2 =~":as_empcode~" ) ) ARG(NAME = ~"as_empcode~" TYPE = string) " update="empexperience" updatewhere=1 updatekeyinplace=no arguments=(("as_empcode", string)) sort="emp_code A " )
retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"empexperience~" ) COLUMN(NAME=~"empexperience.emp_code~") COLUMN(NAME=~"empexperience.organisation~") COLUMN(NAME=~"empexperience.designation~") COLUMN(NAME=~"empexperience.from_date~") COLUMN(NAME=~"empexperience.to_date~") COLUMN(NAME=~"empexperience.gross_amt~") COLUMN(NAME=~"empexperience.curr_code~") COLUMN(NAME=~"empexperience.chg_date~") COLUMN(NAME=~"empexperience.chg_term~") COLUMN(NAME=~"empexperience.chg_user~") COLUMN(NAME=~"empexperience.print_seq~")WHERE( EXP1 =~"empexperience.emp_code~" OP =~"=~" EXP2 =~":as_empcode~" ) ) ARG(NAME = ~"as_empcode~" TYPE = string) " update="empexperience" updatewhere=1 updatekeyinplace=no arguments=(("as_empcode", string)) sort="emp_code A " )
text(band=header alignment="0" text="Employee Code" border="6" color="0" x="2" y="2" height="16" width="89" html.valueishtml="0" name=emp_code_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=header alignment="0" text="Organisation" border="6" color="0" x="93" y="2" height="16" width="145" html.valueishtml="0" name=organisation_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=header alignment="0" text="Designation" border="6" color="0" x="240" y="2" height="16" width="146" html.valueishtml="0" name=designation_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
......@@ -29,6 +27,7 @@ text(band=header alignment="0" text="Currency Code" border="6" color="0" x="622"
text(band=header alignment="0" text="Change Date" border="6" color="0" x="713" y="2" height="16" width="82" html.valueishtml="0" name=chg_date_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
text(band=header alignment="0" text="Change Term" border="6" color="0" x="797" y="2" height="16" width="87" html.valueishtml="0" name=chg_term_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
text(band=header alignment="0" text="Change User" border="6" color="0" x="886" y="2" height="16" width="80" html.valueishtml="0" name=chg_user_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
text(band=header alignment="1" text="Print Seq" border="6" color="33554432" x="968" y="2" height="16" width="71" html.valueishtml="0" name=print_seq_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
column(band=detail id=1 alignment="0" tabsequence=32766 border="5" color="0" x="2" y="1" height="19" width="89" format="[general]" html.valueishtml="0" name=emp_code visible="1" edit.limit=10 edit.case=any edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1090519039" )
column(band=detail id=6 alignment="1" tabsequence=32766 border="5" color="0" x="525" y="1" height="19" width="95" format="[general]" html.valueishtml="0" name=gross_amt visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1090519039" )
column(band=detail id=5 alignment="0" tabsequence=32766 border="5" color="0" x="457" y="1" height="19" width="66" format="[shortdate] [time]" html.valueishtml="0" name=to_date visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1090519039" )
......@@ -40,11 +39,6 @@ column(band=detail id=9 alignment="0" tabsequence=32766 border="5" color="0" x="
column(band=detail id=8 alignment="0" tabsequence=32766 border="5" color="0" x="713" y="1" height="19" width="82" format="[shortdate] [time]" html.valueishtml="0" name=chg_date visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1090519039" )
column(band=detail id=10 alignment="0" tabsequence=32766 border="5" color="0" x="886" y="1" height="19" width="80" format="[general]" html.valueishtml="0" name=chg_user visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1090519039" )
column(band=detail id=11 alignment="1" tabsequence=32766 border="5" color="0" x="968" y="1" height="19" width="71" format="[general]" html.valueishtml="0" name=print_seq visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1090519039" )
column(band=detail id=12 alignment="0" tabsequence=0 border="5" color="0" x="1042" y="1" height="19" width="95" html.valueishtml="0" name=count_code__work visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1090519039" )
column(band=detail id=13 alignment="0" tabsequence=0 border="5" color="0" x="1140" y="1" height="19" width="296" html.valueishtml="0" name=work_country_descr visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1090519039" )
text(band=header alignment="1" text="Print Seq" border="6" color="33554432" x="968" y="2" height="16" width="71" html.valueishtml="0" name=print_seq_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
text(band=header alignment="0" text="Country Code" border="6" color="33554432" x="1041" y="2" height="16" width="96" html.valueishtml="0" name=count_code__work_t visible="1" font.face="Arial" font.height="-11" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
text(band=header alignment="0" text="Work Country Name" border="6" color="33554432" x="1139" y="2" height="16" width="297" html.valueishtml="0" name=work_country_descr_t visible="1" font.face="Arial" font.height="-11" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
htmltable(border="1" )
htmlgen(clientevents="1" clientvalidation="1" clientcomputedfields="1" clientformatting="0" clientscriptable="0" generatejavascript="1" encodeselflinkargs="1" netscapelayers="0" )
export.xml(headgroups="1" includewhitespace="0" metadatatype=0 savemetadata=0 )
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -17,7 +17,7 @@ table(column=(type=char(5) update=yes updatewhereclause=yes key=yes name=pay_tab
column=(type=char(1) update=yes updatewhereclause=yes name=frequency dbname="std_paystru.frequency" initial="2" values="Lump sum 1/Monthly 2/Quarterly 3/Half Yearly 4/Yearly 5/Once In A Two Year 6/Once In Three Year 7/" )
column=(type=char(1) update=yes updatewhereclause=yes name=pay_method dbname="std_paystru.pay_method" initial="S" values="Through Salary S/Claim C/" )
column=(type=char(100) update=yes updatewhereclause=yes name=res_formula dbname="std_paystru.res_formula" )
column=(type=char(1) update=yes updatewhereclause=yes name=upd_paystru dbname="std_paystru.upd_paystru" initial="2" values="If Non Zero 1/Always 2/Never 3/" )
column=(type=char(1) update=yes updatewhereclause=yes name=upd_paystru dbname="std_paystru.upd_paystru" initial="Y" values="Yes Y/No N/" )
column=(type=char(1) update=yes updatewhereclause=yes name=appl_mode dbname="std_paystru.appl_mode" initial="3" values="Cadre wise 1/Grade Wise 2/Employee Specific 3/" )
column=(type=char(1) update=yes updatewhereclause=yes name=mtakehome_mode dbname="std_paystru.mtakehome_mode" initial="A" values="Not Applicable N/Allowance A/Deduction D/" )
column=(type=char(1) update=yes updatewhereclause=yes name=can_modify dbname="std_paystru.can_modify" initial="N" values="Yes Y/No N/" )
......@@ -46,7 +46,7 @@ column(band=detail id=5 alignment="0" tabsequence=30 border="5" color="0" x="166
column(band=detail id=7 alignment="0" tabsequence=40 border="5" color="0" x="166" y="86" height="15" width="80" format="dd/mm/yy" html.valueishtml="0" name=eff_date visible="1" editmask.mask="dd/mm/yy" editmask.imemode=0 editmask.focusrectangle=no font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=9 alignment="1" tabsequence=60 border="5" color="0" x="166" y="106" height="15" width="86" format="#########0.000" html.valueishtml="0" name=amount visible="1" editmask.mask="#########0.000" editmask.imemode=0 editmask.focusrectangle=no font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=11 alignment="0" tabsequence=80 border="5" color="0" x="166" y="126" height="15" width="119" format="[general]" html.valueishtml="0" name=frequency visible="1" ddlb.limit=1 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=14 alignment="0" tabsequence=110 border="5" color="0" x="166" y="166" height="15" width="97" format="[general]" html.valueishtml="0" name=upd_paystru visible="1" ddlb.limit=1 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=14 alignment="0" tabsequence=110 border="5" color="0" x="166" y="166" height="15" width="48" format="[general]" html.valueishtml="0" name=upd_paystru visible="1" ddlb.limit=1 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=16 alignment="0" tabsequence=130 border="5" color="0" x="166" y="186" height="15" width="98" format="[general]" html.valueishtml="0" name=mtakehome_mode visible="1" ddlb.limit=1 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=18 alignment="0" tabsequence=150 border="5" color="0" x="166" y="206" height="15" width="98" format="[general]" html.valueishtml="0" name=mgross_mode visible="1" ddlb.limit=1 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=20 alignment="0" tabsequence=32766 border="5" color="0" x="166" y="226" height="15" width="80" format="dd/mm/yy" html.valueishtml="0" name=chg_date visible="1" editmask.useformat=yes editmask.mask="dd/mm/yy" editmask.imemode=0 editmask.focusrectangle=no font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
......
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