Merging CREATE_JOB and JOBS templates

cmsWebApp/src/performa/utils/Utils.java

@@ -3,7 +3,6 @@ package performa.utils;
 import java.util.*;
 import oneit.objstore.ObjectTransaction;
 import oneit.security.*;
-import oneit.utils.ObjectTransform;
 import oneit.utils.Tuple;
 import performa.orm.*;
 import performa.orm.types.Importance;

cmsWebApp/src/performa/utils/WebUtils.java

@@ -38,16 +38,19 @@ public class WebUtils
     public static final String APPLICANTS_GRID  = "ApplicantsGrid";
     public static final String VIEW_APPLICATION = "ViewApplication";
     
+    
     public static String getArticleLink(HttpServletRequest request, ObjectTransaction objTran, String articleShortcut, String renderMode)
     {
         return getArticleLink(request, getArticleByShortCut(objTran, articleShortcut), "Page");
     }
     
+    
     public static String getArticleLink(HttpServletRequest request, Article article, String renderMode)
     {
         return article.getLink(request, CollectionUtils.mapEntry("cms.rm", renderMode).toMap());
     }
     
+    
     public static String getSamePageInRenderMode (HttpServletRequest request, String renderMode)
     {
         BaseJSP theJSP  = (BaseJSP) request.getAttribute(BaseJSP.JSP_SERVLET);
@@ -56,6 +59,7 @@ public class WebUtils
         return getArticleLink(request, article, renderMode);
     }
     
+    
     public static String getRadioSingleAssocKey(HttpServletRequest request, BaseBusinessClass bbc, String singleAssocName)
     {
         DataMap             dataMap = DataMap.getDataMap (request, true);
@@ -71,6 +75,7 @@ public class WebUtils
         return dataMap.storeORMHandler (dih, bbc, attributeName);
     }
     
+    
     public static boolean descendsFrom (Article article, String parentArticleIdFilter)
     {
         if (article.getIdentifier ().equals (parentArticleIdFilter))
@@ -87,6 +92,7 @@ public class WebUtils
         }
     }
     
+    
     public static String getPortalName(ObjectTransaction objTran, Article article)
     {   
         Article applicantArticle    =   getArticleByShortCut(objTran, APPLICANT_PORTAL);
@@ -111,8 +117,19 @@ public class WebUtils
         return "";
     }
     
+    
     public static Article getArticleByShortCut(ObjectTransaction objTran, String shortCut)
     {
         return ShortcutFilter.doShortcutSearch(objTran, shortCut);
     }
+    
+    
+    public static Boolean isCreateJob(String renderMode)
+    {
+        return renderMode.equals(CREATE_JOB) || 
+                renderMode.equals(ASSESSMENT_CRITERIA) || 
+                renderMode.equals(WORKPLACE_CULTURE) || 
+                renderMode.equals(JOB_MATCH) || 
+                renderMode.equals(JOB_REVIEW);
+    }
 }
\ No newline at end of file

cmsWebApp/webroot/dynamic_content_core.jsp

@@ -11,7 +11,7 @@
     SecUser             loggedInUser    =   SecUser.getTXUser(objTran);
     SecUser             clientUser      =   Utils.checkAdminPortalAccess(loggedInUser) ? loggedInUser : null;
     SecUser             applicantUser   =   Utils.checkApplicantPortalAccess(loggedInUser) ? loggedInUser : null;
-    Article             createJob       =   WebUtils.getArticleByShortCut(objTran, WebUtils.CREATE_JOB);
+    String              renderMode      =   CMSArticleTagDecorator.getRenderMode (request, "Page");
 %>
 
 <%@ include file="setuprequest.jsp" %>
@@ -32,7 +32,6 @@
 <%
     }
 
-    String renderMode = CMSArticleTagDecorator.getRenderMode (request, "Page");
 
     Map m = CollectionUtils.mapEntry(NavigationBarDF.NAV_BAR, navbar.getChildNavBarFor (article))
                         .mapEntry("StartLevel", new Integer (0))

cmsWebApp/webroot/extensions/adminportal/GeneralConfig_adminPortal.xml

@@ -16,21 +16,11 @@
             
         </MAP>
         
+        <!-- AAdded only for legacy data and should never be used   -->
         <MAP    value="CREATE_JOB"  description="Create Job"    TemplatePage="dynamic_content_form_client.jsp">
-            
             <NODE   name="Config"   factory="Participant"   class="oneit.business.content.ArticleConfiguration">
-                
                 <INHERITS   nodename="StandardJSP"/>
-                
-                <RenderMode name="Page"                 preIncludeJSP="extensions/adminportal/job_detail.jsp"/>
-                <RenderMode name="AssessmentCriteria"   preIncludeJSP="extensions/adminportal/assessment_criteria.jsp"/>
-                <RenderMode name="WorkplaceCulture"     preIncludeJSP="extensions/adminportal/workplace_culture.jsp"/>
-                <RenderMode name="JobMatchAssessment"   preIncludeJSP="extensions/adminportal/job_match_assessment.jsp"/>
-                <RenderMode name="JobReview"            preIncludeJSP="extensions/adminportal/job_review_submit.jsp"/>
-                <RenderMode name="CreatedJob"           preIncludeJSP="extensions/adminportal/created_job.jsp"/>
-                
             </NODE>
-            
         </MAP>
         
         <MAP    value="JOBS"    description="Jobs"  TemplatePage="dynamic_content_form_client.jsp">
@@ -43,6 +33,12 @@
                 <RenderMode name="ApplicantsShortlist"  preIncludeJSP="extensions/adminportal/view_applicants_shortlist.jsp"/>
                 <RenderMode name="ApplicantsGrid"       preIncludeJSP="extensions/adminportal/view_applicants_shortlist_grid.jsp"/>
                 <RenderMode name="ViewApplication"      preIncludeJSP="extensions/adminportal/view_application.jsp"/>
+                <RenderMode name="CreateJob"            preIncludeJSP="extensions/adminportal/job_detail.jsp"/>
+                <RenderMode name="AssessmentCriteria"   preIncludeJSP="extensions/adminportal/assessment_criteria.jsp"/>
+                <RenderMode name="WorkplaceCulture"     preIncludeJSP="extensions/adminportal/workplace_culture.jsp"/>
+                <RenderMode name="JobMatchAssessment"   preIncludeJSP="extensions/adminportal/job_match_assessment.jsp"/>
+                <RenderMode name="JobReview"            preIncludeJSP="extensions/adminportal/job_review_submit.jsp"/>
+                <RenderMode name="CreatedJob"           preIncludeJSP="extensions/adminportal/created_job.jsp"/>
             </NODE>
         </MAP>
         

cmsWebApp/webroot/extensions/adminportal/inc/htmlfooter.jsp

     
-        <%            
-            if(article.getIdentifier ().equals (createJob.getIdentifier()))
+        <%@page import="performa.utils.WebUtils"%>
+<%            
+            if(WebUtils.isCreateJob(renderMode))
             {
         %>
                 </div>

cmsWebApp/webroot/extensions/adminportal/inc/htmlheader.jsp

@@ -46,7 +46,10 @@
                                 </ul>
                             </div>
                             <div class="create-job-btn">
-                                <a href="<%= WebUtils.getArticleLink(request, objTran, WebUtils.CREATE_JOB, "Page") %>">Create Job</a>
+                                <%
+                                    Article jobsArticle =   WebUtils.getArticleByShortCut(objTran, WebUtils.JOBS);
+                                %>
+                                <a href="<%= jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.CREATE_JOB).toMap()) %>">Create Job</a>
                             </div>
                         </div>
                     </div>

cmsWebApp/webroot/extensions/adminportal/inc/job_main_tabs.jsp

@@ -7,7 +7,7 @@
 <%
     Job     job         = (Job) process.getAttribute("Job");
     String  pageNumber  = (String)  getData(request, "PageNumber");
-    String  firstPage   = WebUtils.getSamePageInRenderMode(request, "Page");
+    String  firstPage   = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATE_JOB);
     String  secondPage  = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
     String  thirdPage   = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE);
     String  fourthPage  = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_MATCH);

cmsWebApp/webroot/extensions/adminportal/inc/menuinclude.jsp

@@ -24,8 +24,8 @@
             </div>
     <%
         }
-            
-        if(article.getIdentifier ().equals (createJob.getIdentifier()))
+
+        if(WebUtils.isCreateJob(renderMode) )
         {
     %>
            <div class="main-content-area">

cmsWebApp/webroot/extensions/adminportal/inc/shortlist_tabs.jsp

@@ -12,6 +12,14 @@
 %>
 
 <oneit:dynIncluded>
+    <script language="Javascript">
+        function updateOrder(s) {
+            alert(s.value);
+//            $('#changeJobStatu
+//            
+//            sBtn').click();
+        }
+    </script>
     <div class="main-applicants-filter main-shortlist-filter">
         <div class="appli-list-shorting main-shortlist">
             <div class="appli-shorting-dropdown appli-left">
@@ -47,7 +55,7 @@
             </div>
             <div class="appli-shorting-dropdown">
                 <span class="appli-order-label">order by</span>
-                <select class="form-control">
+                <select onChange="updateOrder(this)" class="form-control"   id="sortOrder">
                     <option>Suitability</option>
                     <option>Newest</option>
                     <option>Oldest</option>              

cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp

@@ -7,7 +7,7 @@
 <%
     Job     job         = (Job) process.getAttribute("Job");
     String  nextPage    = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATED_JOB);
-    String  firstPage   = WebUtils.getSamePageInRenderMode(request, "Page");
+    String  firstPage   = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATE_JOB);
     String  secondPage  = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
     String  thirdPage   = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE);
     String  fourthPage  = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_MATCH);

cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp

@@ -18,7 +18,7 @@
             <div class="welcome-box">
                 <div class="dashboard-welcome">
                     <div class="welcome-text"> Welcome <br/> back <%= oneit.security.jsp.SecUserToNameTransform.INSTANCE.transform(SecUser.getTXUser(transaction)) %>! </div>
-                    <a class="d-create-job-btn" href="<%= WebUtils.getArticleLink(request, transaction, WebUtils.CREATE_JOB, "Page") %>">Create New Job</a>
+                    <a class="d-create-job-btn" href="<%= jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.CREATE_JOB).toMap()) %>">Create New Job</a>
                 </div>
                 <div class="col-sm-3 col-xs-12 d-three-box green-light">
                     <div class="d-fl-left eq-height">