S19010037 # Client - Incoming Issues (raised by Client) #Template selection on…

S19010037 # Client - Incoming Issues (raised by Client) #Template selection on create job when no-client

cmsWebApp/src/performa/orm/Job.java

@@ -320,6 +320,10 @@ public class Job extends BaseJob
         {
             search  =   search.andClient(new EqualsFilter<>(getClient()));
         }
+        else
+        {
+            search  =   search.andClient(new IsNullFilter<>());
+        }
 
         return  search.search(getTransaction());
     }
@@ -705,7 +709,7 @@ public class Job extends BaseJob
     {
         StringBuilder sb   = new StringBuilder("create-job-selector rectangle-4");
         
-        sb.append(getHiringTeam().showHasClientSupport() && getClient() != null ? " special" : "");
+        sb.append(getHiringTeam().showHasClientSupport() ? " special" : "");
         sb.append((isTeamplate && isTrue(getFromTemplate())) || (!isTeamplate && isFalse(getFromTemplate())) ?  " checked" : "");
         
         return sb.toString();

cmsWebApp/webroot/extensions/adminportal/job_start_point.jsp

@@ -29,8 +29,6 @@
     job.setJobOwner(companyUser);
     job.setIndustry(hiringTeam.getIndustry());
     job.setGoogleAddressText(hiringTeam.getGoogleAddressText());
-
-    AssessmentCriteriaTemplate[]    templates   =   job.getAssessmentTemplates();   
 %>
 <style>
     .rectangle-4.special{
@@ -94,13 +92,11 @@
                                         <oneit:ormInput obj="<%= job %>" type="radio" attributeName="FromTemplate" value="true"/>
                                         <oneit:recalcClass  htmlTag="div"  classScript="hiringTeam.showHasClientSupport() ? 'show': 'hide'"    hiringTeam="<%= hiringTeam %>">
                                             <tagfile:ormsingleasso_select obj="<%= job %>"   assocName="Client"  options="<%= Utils.getClientsByHiringTeam(transaction) %>"
-                                                                    blankValue="Select your client"   />
+                                                                    blankValue="No Client"/>
                                         </oneit:recalcClass>
                                         <div style="padding-top:10px;">
-                                            <oneit:recalcClass  htmlTag="div"  classScript="(!hiringTeam.showHasClientSupport() || (hiringTeam.showHasClientSupport() && job.getClient() != null)) ? 'show': 'hide'"    hiringTeam="<%= hiringTeam %>" job="<%= job %>">
-                                                <tagfile:ormsingleasso_select   obj="<%= job %>"    assocName="AssessmentTemplate" options="<%= templates %>"  
-                                                                                blankValue="Select your template"/>
-                                            </oneit:recalcClass>
+                                            <tagfile:ormsingleasso_select   obj="<%= job %>"    assocName="AssessmentTemplate" optionsScript="job.getAssessmentTemplates()" job="<%= job%>" 
+                                                                            blankValue="Select your template"/>
                                         </div>
                                     </oneit:recalcClass>
                                 </div>