Skip to content

C
Component Sharing
Commit 87e4bebf authored by Ajit Deshmukh's avatar Ajit Deshmukh
Browse files
Options

Added the Reviewer Remarks field in the Manage SQL header form and added item change on the field

parent d1a3b1b2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 345 additions and 94 deletions
Ajit/Manage SQL Changes APR-26/Java Components/ManageSql.java
View file @ 87e4bebf
......@@ -81,6 +81,7 @@ public class ManageSql extends ValidatorEJB {
BaseLogger.log("3", getUserInfo(), null, "dom case2*>>>> Elements>>["+genericUtility.serializeDom(dom).toString()+"]");//added for testing
BaseLogger.log("3", getUserInfo(), null, "dom2 case2*>>>> Elements>>["+genericUtility.serializeDom(dom2).toString()+"]");//added for testing
BaseLogger.log("3", getUserInfo(), null, "dom1 case2*>>>> Elements>>["+genericUtility.serializeDom(dom1).toString()+"]");
BaseLogger.log("3", getUserInfo(), null, "dom1 case2*>>>> editFlag>>["+editFlag+"]");
} catch (BaseException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
......@@ -347,6 +348,26 @@ public class ManageSql extends ValidatorEJB {
}
}
}
if( childNodeName.equalsIgnoreCase("txn_status") )
{
if (childNode.getFirstChild() == null )
{
}
else
{
String txnStatus = checkNull(getColumnValue("txn_status",dom,"1"));
System.out.println("itmDefault txnStatus:: "+txnStatus);
if(txnStatus.equalsIgnoreCase("R") && editFlag.trim().equalsIgnoreCase("E"))
{
errString = getErrorString("txn_status","INVLDMER",userId);
break;
}
}
}
//End elseif
}//End for loop
}//End for loop
......@@ -565,6 +586,32 @@ public class ManageSql extends ValidatorEJB {
.append("<![CDATA[" + execAprv + "]]>")
.append("</exec_aprv>\r\n");
}
boolean isMSDBA = false;
BaseLogger.log("3", null, null, "profileId>>>"+ profileId);
if (profileId != null) {
String[] profileIds = profileId.split(",");
for (String id : profileIds) {
if ("MSDBA".equalsIgnoreCase(id.trim())) {
isMSDBA = true;
break;
}
}
}
if (isMSDBA) {
valueXmlString.append("<reviewer_remarks protect='0'>")
.append("<![CDATA[]]>")
.append("</reviewer_remarks>\r\n");
} else {
valueXmlString.append("<reviewer_remarks protect='1'>")
.append("<![CDATA[]]>")
.append("</reviewer_remarks>\r\n");
}
BaseLogger.log("3", null, null, "execAprv 523@@>>>"+ execAprv);
//changed by Ashish.J
}
......@@ -578,6 +625,13 @@ public class ManageSql extends ValidatorEJB {
String deptCode = "";
BaseLogger.log("3", null, null, "wfStatus>>>"+ wfStatus);
boolean isMSDBA = false;
BaseLogger.log("3", null, null, "profileId>>>"+ profileId);
// APPLY ONLY WHEN WF_STATUS = A
if(wfStatus != null && wfStatus.trim().equalsIgnoreCase("A")) {
......@@ -636,6 +690,24 @@ public class ManageSql extends ValidatorEJB {
}
}
if (profileId != null) {
String[] profileIds = profileId.split(",");
for (String id : profileIds) {
if ("MSDBA".equalsIgnoreCase(id.trim())) {
isMSDBA = true;
break;
}
}
}
if (isMSDBA) {
valueXmlString.append("<reviewer_remarks protect='0'>")
.append("<![CDATA[]]>")
.append("</reviewer_remarks>\r\n");
}
BaseLogger.log("3", getUserInfo(), null, "profileId::: "+profileId);
BaseLogger.log("3", getUserInfo(), null, "wfStatus:: "+wfStatus);
......
Ajit/Manage SQL Changes APR-26/Java Components/ManageSqlProceed.java
View file @ 87e4bebf
......@@ -98,15 +98,41 @@ public class ManageSqlProceed extends ActionHandlerEJB {
return itmDBAccessEJB.getErrorString("", "MSQLPAE", "", "", conn);
}
String profileId = checkNull(getUserInfo().getProfileId());
BaseLogger.log("3", null, null, "Profile Id of User profileId:: " + profileId);
boolean isMSIMPLSUP = false;
String txnStatus = "";
if (profileId != null) {
String[] profileIds = profileId.split(",");
for (String id : profileIds) {
if ("MSIMPLSUP".equalsIgnoreCase(id.trim())) {
isMSIMPLSUP = true;
break;
}
}
}
if(isMSIMPLSUP){
txnStatus = "S";
}
else{
txnStatus = "T";
}
BaseLogger.log("3", null, null, "txnStatus:: " + txnStatus);
if(existingAprvLvl<1) {
int updatedAprvLvl = existingAprvLvl+1;
BaseLogger.log("3", getUserInfo(), null, "ManageSqlProceed.updateStatus: updatedAprvLvl[" +updatedAprvLvl + "]");
// 🔹 Update APRV_LEVEL
String updateAprvLvlSql = "update sql_changes set APRV_LEVEL = ?, TXN_STATUS = 'T' where tran_id = ?";
String updateAprvLvlSql = "update sql_changes set APRV_LEVEL = ?, TXN_STATUS = ? where tran_id = ?";
PreparedStatement updateAprvLvlPs = conn.prepareStatement(updateAprvLvlSql);
updateAprvLvlPs.setInt(1, updatedAprvLvl);
updateAprvLvlPs.setString(2, tranID);
updateAprvLvlPs.setString(2, txnStatus);
updateAprvLvlPs.setString(3, tranID);
int updateAprvLvlCnt = updateAprvLvlPs.executeUpdate();
......
Ajit/Manage SQL Changes APR-26/Manage SQL Metadata/sql_changes11.xml
View file @ 87e4bebf
......@@ -297,12 +297,27 @@
<name>enterprise_descr</name>
<dbname>enterprise.enterprise_descr</dbname>
</table_column>
<table_column>
<type size="2000">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>reviewer_remarks</name>
<dbname>sql_changes.reviewer_remarks</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;sql_changes&quot; ) TABLE(NAME=&quot;users&quot; ALIAS=&quot;users_a&quot; ) TABLE(NAME=&quot;users&quot; ALIAS=&quot;users_b&quot; ) TABLE(NAME=&quot;itemser&quot; ) TABLE(NAME=&quot;employee&quot; ) TABLE(NAME=&quot;users&quot; ALIAS=&quot;users_c&quot; ) TABLE(NAME=&quot;enterprise&quot; ) COLUMN(NAME=&quot;sql_changes.tran_id&quot;) COLUMN(NAME=&quot;sql_changes.tran_date&quot;) COLUMN(NAME=&quot;sql_changes.req_id&quot;) COLUMN(NAME=&quot;sql_changes.req_date&quot;) COLUMN(NAME=&quot;sql_changes.emp_code__given&quot;) COLUMN(NAME=&quot;sql_changes.emp_code__merge&quot;) COLUMN(NAME=&quot;sql_changes.tran_id__org&quot;) COLUMN(NAME=&quot;sql_changes.itm_ver&quot;) COLUMN(NAME=&quot;sql_changes.chg_user&quot;) COLUMN(NAME=&quot;sql_changes.chg_term&quot;) COLUMN(NAME=&quot;sql_changes.conf_date&quot;) COLUMN(NAME=&quot;sql_changes.enterprises&quot;) COLUMN(NAME=&quot;users_a.name&quot;) COLUMN(NAME=&quot;itemser.descr&quot;) COLUMN(NAME=&quot;users_b.name&quot;) COMPUTE(NAME=&quot;(CASE WHEN sql_changes.executed=&apos;Y&apos; then &apos;YES&apos; else &apos;No&apos; END) AS Executed&quot;) COLUMN(NAME=&quot;sql_changes.chg_date&quot;) COMPUTE(NAME=&quot;(CASE WHEN sql_changes.confirmed=&apos;Y&apos; then &apos;YES&apos; else &apos;No&apos; END) AS Confirm&quot;) COLUMN(NAME=&quot;sql_changes.confirmed&quot;) COLUMN(NAME=&quot;users_c.name&quot;) COMPUTE(NAME=&quot; (users_c.name ||&apos;(&apos;||trim(sql_changes.emp_code_aprv)||&apos;)&apos;) as confirmed_by
&quot;) COLUMN(NAME=&quot;sql_changes.exec_rights&quot;) COLUMN(NAME=&quot;sql_changes.tran_id__ref&quot;) COMPUTE(NAME=&quot;(select DTL_DESCR from ser_request where req_id = sql_changes.req_id) as req_descr&quot;) COLUMN(NAME=&quot;sql_changes.cust_code&quot;) COMPUTE(NAME=&quot;(SELECT cust_name FROM customer WHERE cust_code = (SELECT cust_code FROM ser_request WHERE req_id = sql_changes.req_id)) as cust_name&quot;) COLUMN(NAME=&quot;sql_changes.wf_status&quot;) COLUMN(NAME=&quot;sql_changes.wf_remarks&quot;) COLUMN(NAME=&quot;sql_changes.remarks&quot;) COLUMN(NAME=&quot;sql_changes.aprv_level&quot;) COLUMN(NAME=&quot;sql_changes.exec_aprv&quot;) COLUMN(NAME=&quot;sql_changes.review_yn&quot;) COLUMN(NAME=&quot;sql_changes.txn_status&quot;) COLUMN(NAME=&quot;sql_changes.closed_yn&quot;) COLUMN(NAME=&quot;sql_changes.closed_by&quot;) COLUMN(NAME=&quot;sql_changes.closed_date&quot;) COLUMN(NAME=&quot;enterprise.enterprise_descr&quot;) JOIN (LEFT=&quot;sql_changes.emp_code__given&quot; OP =&quot;=&quot;RIGHT=&quot;users_a.code&quot; OUTER1 =&quot;sql_changes.emp_code__given&quot; ) JOIN (LEFT=&quot;sql_changes.itm_ver&quot; OP =&quot;=&quot;RIGHT=&quot;itemser.item_ser&quot; OUTER1 =&quot;sql_changes.itm_ver&quot; ) JOIN (LEFT=&quot;sql_changes.emp_code_aprv&quot; OP =&quot;=&quot;RIGHT=&quot;employee.emp_code&quot; OUTER1 =&quot;sql_changes.emp_code_aprv&quot; ) JOIN (LEFT=&quot;sql_changes.emp_code__merge&quot; OP =&quot;=&quot;RIGHT=&quot;users_b.code&quot; OUTER1 =&quot;sql_changes.emp_code__merge&quot; ) JOIN (LEFT=&quot;sql_changes.emp_code_aprv&quot; OP =&quot;=&quot;RIGHT=&quot;users_c.code&quot; OUTER1 =&quot;sql_changes.emp_code_aprv&quot; ) JOIN (LEFT=&quot;sql_changes.enterprises&quot; OP =&quot;=&quot;RIGHT=&quot;enterprise.enterprise&quot; OUTER1 =&quot;sql_changes.enterprises&quot; )) </retrieve>
&quot;) COLUMN(NAME=&quot;sql_changes.exec_rights&quot;) COLUMN(NAME=&quot;sql_changes.tran_id__ref&quot;) COMPUTE(NAME=&quot;(select DTL_DESCR from ser_request where req_id = sql_changes.req_id) as req_descr&quot;) COLUMN(NAME=&quot;sql_changes.cust_code&quot;) COMPUTE(NAME=&quot;(SELECT cust_name FROM customer WHERE cust_code = (SELECT cust_code FROM ser_request WHERE req_id = sql_changes.req_id)) as cust_name&quot;) COLUMN(NAME=&quot;sql_changes.wf_status&quot;) COLUMN(NAME=&quot;sql_changes.wf_remarks&quot;) COLUMN(NAME=&quot;sql_changes.remarks&quot;) COLUMN(NAME=&quot;sql_changes.aprv_level&quot;) COLUMN(NAME=&quot;sql_changes.exec_aprv&quot;) COLUMN(NAME=&quot;sql_changes.review_yn&quot;) COLUMN(NAME=&quot;sql_changes.txn_status&quot;) COLUMN(NAME=&quot;sql_changes.closed_yn&quot;) COLUMN(NAME=&quot;sql_changes.closed_by&quot;) COLUMN(NAME=&quot;sql_changes.closed_date&quot;) COLUMN(NAME=&quot;enterprise.enterprise_descr&quot;) COLUMN(NAME=&quot;sql_changes.reviewer_remarks&quot;) JOIN (LEFT=&quot;sql_changes.emp_code__given&quot; OP =&quot;=&quot;RIGHT=&quot;users_a.code&quot; OUTER1 =&quot;sql_changes.emp_code__given&quot; ) JOIN (LEFT=&quot;sql_changes.itm_ver&quot; OP =&quot;=&quot;RIGHT=&quot;itemser.item_ser&quot; OUTER1 =&quot;sql_changes.itm_ver&quot; ) JOIN (LEFT=&quot;sql_changes.emp_code_aprv&quot; OP =&quot;=&quot;RIGHT=&quot;employee.emp_code&quot; OUTER1 =&quot;sql_changes.emp_code_aprv&quot; ) JOIN (LEFT=&quot;sql_changes.emp_code__merge&quot; OP =&quot;=&quot;RIGHT=&quot;users_b.code&quot; OUTER1 =&quot;sql_changes.emp_code__merge&quot; ) JOIN (LEFT=&quot;sql_changes.emp_code_aprv&quot; OP =&quot;=&quot;RIGHT=&quot;users_c.code&quot; OUTER1 =&quot;sql_changes.emp_code_aprv&quot; ) JOIN (LEFT=&quot;sql_changes.enterprises&quot; OP =&quot;=&quot;RIGHT=&quot;enterprise.enterprise&quot; OUTER1 =&quot;sql_changes.enterprises&quot; )WHERE( EXP1 =&quot;TRUNC(sql_changes.chg_date)&quot; OP =&quot;&gt;=&quot; EXP2 =&quot;:From_Date&quot; LOGIC =&quot;and&quot; ) WHERE( EXP1 =&quot;TRUNC(sql_changes.chg_date)&quot; OP =&quot;&lt;=&quot; EXP2 =&quot;:To_Date&quot; ) ) ARG(NAME = &quot;From_Date&quot; TYPE = datetime) ARG(NAME = &quot;To_Date&quot; TYPE = datetime) </retrieve>
<update>sql_changes</update>
<updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace>
<argument>
<name>From_Date</name>
<type>datetime</type>
</argument>
<argument>
<name>To_Date</name>
<type>datetime</type>
</argument>
</TableDefinition>
<TextObject>
<band>Header</band>
......@@ -618,7 +633,7 @@
<text>Confirm</text>
<border>2</border>
<color>33554432</color>
<x>4706</x>
<x>5066</x>
<y>2</y>
<height>16</height>
<width>58</width>
......@@ -870,7 +885,7 @@
<text>Users Name</text>
<border>2</border>
<color>33554432</color>
<x>4766</x>
<x>5126</x>
<y>1</y>
<height>16</height>
<width>93</width>
......@@ -1312,6 +1327,34 @@
<color>1073741824</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Enterprise Description</text>
<border>2</border>
<color>33554432</color>
<x>4706</x>
<y>1</y>
<height>16</height>
<width>358</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>enterprise_descr_t</name>
<visible>1</visible>
<font>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>536870912</color>
</background>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>1</id>
......@@ -1737,7 +1780,7 @@
<tabsequence>32766</tabsequence>
<border>2</border>
<color>33554432</color>
<x>4706</x>
<x>5066</x>
<y>2</y>
<height>19</height>
<width>58</width>
......@@ -2067,7 +2110,7 @@
<tabsequence>32766</tabsequence>
<border>2</border>
<color>33554432</color>
<x>4766</x>
<x>5126</x>
<y>1</y>
<height>16</height>
<width>93</width>
......@@ -2643,15 +2686,22 @@
<tabsequence>32766</tabsequence>
<border>2</border>
<color>33554432</color>
<x>4862</x>
<x>4706</x>
<y>1</y>
<height>16</height>
<width>358</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>enterprise_descr</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Arial</face>
<height>-10</height>
......@@ -2665,20 +2715,21 @@
<color>536870912</color>
</background>
</ColumnObject>
<TextObject>
<band>Header</band>
<ColumnObject>
<band>Detail</band>
<id>38</id>
<alignment>0</alignment>
<text>Enterprise Description</text>
<border>2</border>
<tabsequence>0</tabsequence>
<border>0</border>
<color>33554432</color>
<x>4861</x>
<x>5222</x>
<y>1</y>
<height>16</height>
<width>359</width>
<width>170</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>enterprise_descr_t</name>
<name>reviewer_remarks</name>
<visible>1</visible>
<font>
<face>Arial</face>
......@@ -2692,6 +2743,34 @@
<mode>1</mode>
<color>536870912</color>
</background>
</ColumnObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Reviewer Remarks</text>
<border>0</border>
<color>33554432</color>
<x>5221</x>
<y>1</y>
<height>19</height>
<width>171</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>reviewer_remarks_t</name>
<visible>1</visible>
<font>
<face>Arial</face>
<height>-12</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>1073741824</color>
</background>
</TextObject>
<HtmlTable>
<border>1</border>
......
Ajit/Manage SQL Changes APR-26/SQL/SQLs
View file @ 87e4bebf
......@@ -487,3 +487,6 @@ update messages set MSG_STR = 'Transaction must be reviewed before proceeding.',
update genmst set FLD_MIN = 'SELECT COUNT(1) FROM sql_changes WHERE txn_status in (''T'',''K'',''A'',''X'',''P'',''Y'',''L'',''Z'',''R'',''D'',''E'') AND tran_id = ?',FLD_MAX = 1 where error_cd = 'MSQLAREVIW';
---------23rd July-------
alter table sql_changes add (reviewer_remarks varchar2(2000));
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