Added the Reviewed button on the screen and functional logic for button

Ajit/Manage SQL Changes APR-26/Java Components/ManageSqlProceed.java

@@ -6,6 +6,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 
 import ibase.utility.BaseLogger;
+import ibase.utility.E12GenericUtility;
 import ibase.utility.UserInfoBean;
 import ibase.webitm.ejb.ActionHandlerEJB;
 import ibase.webitm.ejb.ITMDBAccessEJB;
@@ -15,6 +16,7 @@ import ibase.webitm.utility.ITMException;
 public class ManageSqlProceed extends ActionHandlerEJB {
 	public String updateStatus(String tranID, String xtraParams, String forcedFlag)
 			throws RemoteException, ITMException {
+					E12GenericUtility genericUtility = new E12GenericUtility();
 		Connection conn = null;
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
 		String quotType = "", custCode = "";
@@ -31,24 +33,66 @@ public class ManageSqlProceed extends ActionHandlerEJB {
 			userInfo = getUserInfo();
 			validatorEJB = new ValidatorEJB();
 			BaseLogger.log("3", getUserInfo(), null, "ManageSqlProceed --> tranID [" + tranID + "]");
+			String action = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "actionTitle");
 
 
 			conn = getConnection();
 			String userId = validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
 			String tranIdRef = "";
 			int existingAprvLvl = 0;
+			String wfStatus = "";
+			String reviewed = "";
+			String executionAprv = "";
 			
 			
-			String getAprvLvlSql = "select APRV_LEVEL, TRAN_ID__REF from sql_changes where tran_id = ?";
+			String getAprvLvlSql = "select APRV_LEVEL, TRAN_ID__REF, WF_STATUS, REVIEW_YN, EXEC_APRV from sql_changes where tran_id = ?";
 			PreparedStatement getAprvLvlPs = conn.prepareStatement(getAprvLvlSql);
 			getAprvLvlPs.setString(1, tranID);
 			ResultSet getAprvLvlRs = getAprvLvlPs.executeQuery();
 			while(getAprvLvlRs.next()) {
 				existingAprvLvl = getAprvLvlRs.getInt("APRV_LEVEL");
 				tranIdRef = checkNull(getAprvLvlRs.getString("TRAN_ID__REF"));
+				wfStatus = checkNull(getAprvLvlRs.getString("WF_STATUS"));
+				reviewed = checkNull(getAprvLvlRs.getString("REVIEW_YN"));
+				executionAprv = checkNull(getAprvLvlRs.getString("EXEC_APRV"));
+			}
+
+            if (action.trim().equalsIgnoreCase("Reviewed")) {
+				BaseLogger.log("3", null, null, "In Reviewed condition.........");
+
+				if (!executionAprv.trim().equalsIgnoreCase("Y")) {
+					BaseLogger.log("3", getUserInfo(), null, "Execution Approval is not Y");
+					return itmDBAccessEJB.getErrorString("", "MSQLCNR", "", "", conn);
+				}
+
+				if (executionAprv.trim().equalsIgnoreCase("Y")) {
+					if (!wfStatus.trim().equalsIgnoreCase("A")) {
+						BaseLogger.log("3", getUserInfo(), null, "Workflow not approved");
+						return itmDBAccessEJB.getErrorString("", "MSQLCNR", "", "", conn);
+					}
+				}
 
+				if (executionAprv.trim().equalsIgnoreCase("Y") && wfStatus.trim().equalsIgnoreCase("A")) {
+					if (!reviewed.trim().equalsIgnoreCase("Y")) {
+						BaseLogger.log("3", getUserInfo(), null, "Not send for review");
+						return itmDBAccessEJB.getErrorString("", "MSQLCNR", "", "", conn);
+					}
+				}
+
+				String updateStatusForReviewed = "update sql_changes set txn_status = 'N' where tran_id = ?";
+				PreparedStatement updateStatusForReviewedPs = conn.prepareStatement(updateStatusForReviewed);
+				updateStatusForReviewedPs.setString(1, tranID);
+				int updateStatusForReviewedCount = updateStatusForReviewedPs.executeUpdate();
+				BaseLogger.log("3", getUserInfo(), null, "updateStatusForReviewedCount:: "+updateStatusForReviewedCount);
+				if (updateStatusForReviewedCount>0) {
+						BaseLogger.log("3", getUserInfo(), null, "Reviewed succesfully");
+						return itmDBAccessEJB.getErrorString("", "MSQLRS", "", "", conn);
 					}
 
+			}
+			
+			if (action.trim().equalsIgnoreCase("Proceed")) {
+				BaseLogger.log("3", null, null, "In Proceed condition.........");
 			if(tranIdRef.trim().length()!=0){
 				BaseLogger.log("3", getUserInfo(), null, "MSQLPAE Proceed already completed.");
 				return itmDBAccessEJB.getErrorString("", "MSQLPAE", "", "", conn);
@@ -83,6 +127,8 @@ public class ManageSqlProceed extends ActionHandlerEJB {
 				return itmDBAccessEJB.getErrorString("", "MSQLAPROC", "", "", conn);
 			}
 
+		}
+		
 		} catch (Exception e) {
 		    if (conn != null) {
 		        try {

Ajit/Manage SQL Changes APR-26/Java Components/ManageSqlReleaseToQC.java

@@ -99,10 +99,12 @@ public class ManageSqlReleaseToQC extends ActionHandlerEJB{
 			String executiveApproval = "";
 			String tranIdRefForVal = "";
 			String wfStatus = "";
+			String review = "";
+			String txnStatus = "";
 
 
 
-			String getAprvLvlSql = "select APRV_LEVEL,EXEC_APRV,TRAN_ID__REF,WF_STATUS from sql_changes where tran_id = ?";
+			String getAprvLvlSql = "select APRV_LEVEL,EXEC_APRV,TRAN_ID__REF,WF_STATUS, REVIEW_YN, TXN_STATUS from sql_changes where tran_id = ?";
 			PreparedStatement getAprvLvlPs = conn.prepareStatement(getAprvLvlSql);
 			getAprvLvlPs.setString(1, tranID);
 			ResultSet getAprvLvlRs = getAprvLvlPs.executeQuery();
@@ -111,6 +113,8 @@ public class ManageSqlReleaseToQC extends ActionHandlerEJB{
 				executiveApproval = checkNull(getAprvLvlRs.getString("EXEC_APRV"));
 				tranIdRefForVal = checkNull(getAprvLvlRs.getString("TRAN_ID__REF"));
 				wfStatus = checkNull(getAprvLvlRs.getString("WF_STATUS"));
+				review = checkNull(getAprvLvlRs.getString("REVIEW_YN"));
+				txnStatus = checkNull(getAprvLvlRs.getString("TXN_STATUS"));
 
 			}
 
@@ -118,10 +122,16 @@ public class ManageSqlReleaseToQC extends ActionHandlerEJB{
     	    if (getAprvLvlPs != null) { getAprvLvlPs.close(); }
 			BaseLogger.log("3", null, null, "existingAprvLvl::" +  existingAprvLvl + "]");
 			BaseLogger.log("3", null, null, "executeRights::" +  executiveApproval + "]");
-
-
+			BaseLogger.log("3", null, null, "review::" +  review + "]");
+			BaseLogger.log("3", null, null, "txnStatus::" +  txnStatus + "]");
             BaseLogger.log("3", null, null, "tranIdRefForVal::" +  tranIdRefForVal + "]");
 
+			if(!review.trim().equalsIgnoreCase("N")){
+				if(!txnStatus.trim().equalsIgnoreCase("N")){
+				    BaseLogger.log("3", null, null, "Transaction not reviewed");
+					return itmDBAccessEJB.getErrorString("", "MSQLNR", "", "", conn);
+				}
+			}
 
 
 			String checkQcTranCountSql = "select count(tran_id) as qcTranCount from sql_changes where tran_id__ref = ?";

Ajit/Manage SQL Changes APR-26/SQL/SQLs

@@ -329,3 +329,26 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E
 ('MSQLARRS','Transaction already released on the respective server.','The transaction has already been released on the respective server.','E','Y',null,null,null,to_date('25-DEC-13','DD-MON-RR'),'BASE      ','BASE',null,null);
 
 
+
+-----------12th May-----------
+
+Insert into OBJ_ACTIONS (OBJ_NAME,LINE_NO,IMAGE,DESCRIPTION,SERVICE_CODE,INTERACTIVE,RIGHTS_CHAR,TITLE,FORM_NO,SERVICE_HANDLER,PLACEMENT,ACTION_TYPE,TRAN_TYPE,CHG_DATE,CHG_TERM,CHG_USER,IS_CONFIRMATION_REQ,SEP_DUTY_OPT,RE_AUTH_OPT,SHOW_IN_PANEL,PAGE_CONTEXT,TYPE,ACTION_ARG,SWIPE_POSITION,MULTI_ROW_OPT,ACTION_ID,DEF_NODATA,IN_PROC_INTRUPT,ESTIMATED_TIME,ACTION_GROUP,DISPLAY_OPT,DISPLAY_MODE,SHOW_CONFIRM,REC_SPECIFIC) values
+('sql_changes',60,'ibase/resource/objaction/confirm.svg','Reviewed','proc_post_item_change','a','R','Reviewed','1','2',null,'U',null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,'2','000',null);
+
+
+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 
+('MSQLRS','Transaction Reviewed successfully.','The transaction has been reviewed successfully.','P','Y',null,null,null,to_date('25-DEC-13','DD-MON-RR'),'BASE      ','BASE',null,null);
+
+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 
+('MSQLCNR ','Transaction cannot be reviewed.','The transaction cannot be reviewed.','E','Y',null,null,null,to_date('25-DEC-13','DD-MON-RR'),'BASE      ','BASE',null,null);
+
+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 
+('MSQLNR ','Transaction not reviewed. Cannot release to QC.','The transaction is not reviewed. Release to QC is not allowed.','E','Y',null,null,null,to_date('25-DEC-13','DD-MON-RR'),'BASE      ','BASE',null,null);
+
+
+Insert into USER_RIGHTS (PROFILE_ID,APPLICATION,MENU_ROW,MENU_COL,MENU_SUBCOL,LEVEL_4,LEVEL_5,MENU_NAME,RIGHTS,ACC_FILT,DEF_FILT,OBJ_NAME,FAV_OPTION,FAV_ORDER,EXCLUDE_RIGHTS_CHAR,ATTACH_RIGHTS,NO_OFFLINE_ALLWD,MOB_DEPLOY,DEVICE_SECURITY,DEVICE_ACC_CLASS) values 
+('MSDBA','SYS',23,1,0,0,0,'Manage SQL','ERA','REVIEW_YN = ''Y''',null,'sql_changes',null,null,null,null,null,null,null,null);
+
+
+
+