separating time approval and leave review roles instead of one.

src/main/java/in/bloomington/timer/action/LeaveReviewAction.java

@@ -197,8 +197,8 @@ public List<GroupManager> getManagers(){
 	    GroupManagerList gml = new GroupManagerList(user.getId());
 	    getPay_period_id();
 	    gml.setPay_period_id(pay_period_id);
-	    gml.setApproversOnly();
-	    // gml.setLeaveReviewOnly();
+	    // gml.setApproversOnly();
+	    gml.setLeaveReviewOnly();
 	    String back = gml.find();
 	    if(back.isEmpty()){
 		List<GroupManager> ones = gml.getManagers();

src/main/java/in/bloomington/timer/bean/GroupManager.java

@@ -538,4 +538,9 @@ public String doDelete(){
 
 insert into group_managers select 0,m.group_id,m.employee_id,7,m.start_date,null,m.primary_flag,null from group_managers m,groups g where m.expire_date is null and m.group_id=g.id and m.wf_node_id=3 and m.primary_flag is not null and g.department_id not in (8,16,30,36);
 
+delete from group_managers where wf_node_id=7;
+
+select * from groups g where g.id not in (select group_id from group_managers where wf_node_id=7) and g.department_id not in (8,16,20,36);
+
+
  */

src/main/java/in/bloomington/timer/list/EmployeeList.java

@@ -484,11 +484,39 @@ else if(!pay_period_id.isEmpty() &&
       select distinct e.id,e.username,e.first_name,e.last_name,e.id_code,e.employee_number,e.ad_sid,e.email,e.roles,date_format(e.added_date,'%m/%d/%Y'),e.inactive                     from employees e                                                                join department_employees de on de.employee_id=e.id                             left join jobs j on j.employee_id=e.id                                          left join `groups` g on g.id=j.group_id,                                          pay_periods pd                                                                  where  pd.id=631 and (de.department_id = 3 or de.department2_id=3 or g.department_id=3) and  ((de.effective_date <= pd.start_date  and de.expire_date is null or de.expire_date >= pd.end_date )  or (j.effective_date <= pd.start_date and  j.expire_date is null or j.expire_date >= pd.end_date)) and  e.employee_number is not null order by e.last_name,e.first_name
 
 
-      select distinct concat_ws(' ',e.first_name,e.last_name),e.email
+      select distinct d.name,concat_ws(' ',e.first_name,e.last_name) full_name,e.email
       from employees e
       join jobs j on j.employee_id=e.id                                               join `groups` g on g.id=j.group_id
-      where j.expire_date is null and g.department_id=16
-      and j.salary_group_id in (1,2,5,11);
+      join departments d on d.id = g.department_id
+      where j.expire_date is null and g.department_id in (3,5,7,8)
+      and e.email is not null and e.email <> ''
+      and j.salary_group_id in (1,2,5,11)
+      order by d.name,full_name
+      into outfile '/var/lib/mysql-files/employees_emails.csv'                         fields terminated by ','                                                        lines terminated by '\n';
+
+update code_cross_ref set GL_String = '110115151000' where id = '2';
+update code_cross_ref set GL_String = '240315150000' where id = '18';
+update code_cross_ref set GL_String = '240415150000' where id = '19';
+update code_cross_ref set GL_String = '110115151600' where id = '20';
+update code_cross_ref set GL_String = '110115150500' where id = '21';
+
+update code_cross_ref set GL_String = '110115151000' where id = '22';
+update code_cross_ref set GL_String = '110115152000' where id = '23';
+update code_cross_ref set GL_String = '240615150002' where id = '24';
+update code_cross_ref set GL_String = '223415150000' where id = '25';
+update code_cross_ref set GL_String = '110115156000' where id = '26';
+
+update code_cross_ref set GL_String = '240315150000' where id = '27';
+update code_cross_ref set GL_String = '110115156000' where id = '28';
+update code_cross_ref set GL_String = '110115151600' where id = '29';
+update code_cross_ref set GL_String = '110115150500' where id = '30';
+update code_cross_ref set GL_String = '110115152000' where id = '31';
+
+update code_cross_ref set GL_String = '240615150002' where id = '32';
+update code_cross_ref set GL_String = '110115151000' where id = '33';
+
+      
+
       
       
     */

src/main/java/in/bloomington/timer/report/GroupsReport.java

@@ -146,7 +146,7 @@ public String findManagers(){
 	ResultSet rs = null;
 	String qq = "select a.group_name, a.approvers,b.processors from( "+
 	    "select g.name group_name, g.id group_id, group_concat(distinct concat_ws(' ',e.first_name,e.last_name, if(gm.primary_flag is not null,\"(Primary)\",\"\")) "+
-	    "order by e.first_name "+
+	    "order by gm.primary_flag desc, e.first_name "+
 	    "asc separator ';') approvers "+
 	    "from `groups` g "+
 	    "left join group_managers gm on g.id=gm.group_id "+
@@ -157,7 +157,7 @@ public String findManagers(){
 	    "group by g.id order by g.name) a, "+
 	    "(select g.name group_name, g.id group_id, "+
 	    "group_concat(distinct concat_ws(' ',e.first_name,e.last_name, if(gm.primary_flag is not null,\"(Primary)\",\"\")) "+
-	    "order by e.first_name "+
+	    "order by gm.primary_flag desc, e.first_name "+
 	    "asc separator ';') processors "+
 	    "from `groups` g "+
 	    "left join group_managers gm on g.id=gm.group_id "+

src/main/webapp/WEB-INF/jsp/header.jsp

@@ -53,7 +53,7 @@
       <s:if test="user.isLeaveEligible()">
 	  <a href="<s:property value='#application.url'/>leave_request.action?job_id=<s:property value='user.job_id' />">Leave Request </a>	
       </s:if>      
-      <s:if test="user.canApprove() && user.isLeaveEligible()">      
+      <s:if test="user.canLeaveReview() && user.isLeaveEligible()">      
           <a href="<s:property value='#application.url'/>leave_review.action">Leave Review</a>
       </s:if>
       <s:if test="user.isHrAdmin()">

src/main/webapp/WEB-INF/jsp/leave_view.jsp

@@ -24,7 +24,12 @@
 	<s:if test="leave.hasReviewer()">
 	    <li><b>Reviewer: </b><s:property value="leave.reviewer" /></li>
 	    <s:if test="leave.hasReviewNotes()">
-		<li><b>Review Notes: </b><s:property value="leave.reviewNotes" /></li>
+	        <s:if test="leave.isCancelled()">	    
+ 		    <li><b>Cancel Reason(s): </b><s:property value="leave.reviewNotes" /></li>
+		</s:if>
+		<s:else>
+		   <li><b>Review Notes: </b><s:property value="leave.reviewNotes" /></li>
+		</s:else>
 	    </s:if>
 	</s:if>
     </ul>