Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
PERFORMA_REPLICA
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Muhammad Usman
PERFORMA_REPLICA
Commits
10a1f739
Commit
10a1f739
authored
Oct 23, 2018
by
Saliya Randunu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix the job occupatino selector requriemtn to capture id from popup
parent
6e9ff86d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
7 deletions
+23
-7
job_detail.jsp
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
+23
-7
No files found.
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
View file @
10a1f739
...
@@ -23,6 +23,8 @@
...
@@ -23,6 +23,8 @@
<script type="text/javascript">
<script type="text/javascript">
var lastclickedOccid = 0 , lastclickedOcc = "" ;
var occPopup;
$(document).ready(function()
$(document).ready(function()
{
{
setupRecalc ($("form#editJob"), {'recalcOnError':true});
setupRecalc ($("form#editJob"), {'recalcOnError':true});
...
@@ -34,7 +36,7 @@
...
@@ -34,7 +36,7 @@
var popup_width = 1040;
var popup_width = 1040;
new jBox('Modal', {
occPopup =
new jBox('Modal', {
id : "occupation-list",
id : "occupation-list",
attach: '.select-occupation',
attach: '.select-occupation',
title: 'Select the occupation classification for this job',
title: 'Select the occupation classification for this job',
...
@@ -48,6 +50,13 @@
...
@@ -48,6 +50,13 @@
});
});
$(document).on("click",".occupation_content_column ul li",function(){
$(document).on("click",".occupation_content_column ul li",function(){
lastclickedOccid = $(this).data('id');
lastclickedOcc = $(this).data('occ');
$(".select-occupation").val(lastclickedOcc);
$("#select-occupation-id").val(lastclickedOccid);
$(this).siblings('li').removeClass("clicked");
$(this).siblings('li').removeClass("clicked");
$(this).addClass("clicked");
$(this).addClass("clicked");
...
@@ -70,6 +79,12 @@
...
@@ -70,6 +79,12 @@
}
}
}
}
});
});
$("#save-job-occ").on("click",function(){
if(!lastclickedOccid==0){
occPopup.close();
}
});
});
});
function addWorkflow()
function addWorkflow()
...
@@ -221,7 +236,8 @@
...
@@ -221,7 +236,8 @@
<label><oneit:label GUIName="Job Occupation Classification" /></label>
<label><oneit:label GUIName="Job Occupation Classification" /></label>
<input type="text" class="form-control select-occupation search-input " placeholder="Select the occupation classification"
<input type="text" class="form-control select-occupation search-input " placeholder="Select the occupation classification"
value="<%= job.getOccupation() != null ? job.getOccupation() : "Select the occupation classification"%>"></input>
value="<%= job.getOccupation() != null ? job.getOccupation() : "Select the occupation classification"%>"></input>
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="Occupation" options="<%= Occupation.searchAll(transaction) %>"/>
<input type="hidden" id="select-occupation-id" />
<!--<tagfile:ormsingleasso_select obj="<%= job %>" assocName="Occupation" options="<%= Occupation.searchAll(transaction) %>"/>-->
</div>
</div>
</div>
</div>
...
@@ -414,28 +430,28 @@
...
@@ -414,28 +430,28 @@
for (Occupation firstLevel : firstLevelOccupations)
for (Occupation firstLevel : firstLevelOccupations)
{
{
%>
%>
<li class="main-item
">
<li class="main-item" data-id="<%= firstLevel.getObjectID()%>" data-occ="<%= firstLevel%>
">
<span> <%= firstLevel%> </span>
<span> <%= firstLevel%> </span>
<ul class="first-child">
<ul class="first-child">
<%
<%
for (Occupation secondLevel : firstLevel.getChildOccupationsSet())
for (Occupation secondLevel : firstLevel.getChildOccupationsSet())
{
{
%>
%>
<li >
<li
data-id="<%= secondLevel.getObjectID()%>" data-occ="<%= secondLevel%>"
>
<span> <%= secondLevel%></span>
<span> <%= secondLevel%></span>
<ul class="second-child">
<ul class="second-child">
<%
<%
for (Occupation thirdLevel : secondLevel.getChildOccupationsSet())
for (Occupation thirdLevel : secondLevel.getChildOccupationsSet())
{
{
%>
%>
<li >
<li
data-id="<%= thirdLevel.getObjectID()%>" data-occ="<%= thirdLevel%>"
>
<span> <%= thirdLevel%></span>
<span> <%= thirdLevel%></span>
<ul class="third-child">
<ul class="third-child">
<%
<%
for (Occupation fourthLevel : thirdLevel.getChildOccupationsSet())
for (Occupation fourthLevel : thirdLevel.getChildOccupationsSet())
{
{
%>
%>
<li >
<li
data-id="<%= fourthLevel.getObjectID()%>" data-occ="<%= fourthLevel%>"
>
<span> <%= fourthLevel%></span>
<span> <%= fourthLevel%></span>
</li>
</li>
<%
<%
...
@@ -468,7 +484,7 @@
...
@@ -468,7 +484,7 @@
Select the most appropriate Category to help narrow down your Occupation
Select the most appropriate Category to help narrow down your Occupation
</div>
</div>
<div class="occupation_select_button">
<div class="occupation_select_button">
<button type="button" value="Save Job Occupation" class="btn btn-primary largeBtn" style="" >Save Job Occupation</button>
<button type="button" value="Save Job Occupation"
id="save-job-occ"
class="btn btn-primary largeBtn" style="" >Save Job Occupation</button>
</div>
</div>
</div>
</div>
</oneit:form>
</oneit:form>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment