Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Add Effort Estimates Offshore/Onsite fields #472

Merged
merged 1 commit into from
Mar 25, 2019
Merged

Add Effort Estimates Offshore/Onsite fields #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/web/WEB-INF/includes/contest/editTab.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,13 @@
</tr>
<tr></tr>
<tr class="effortEstimateRow hide">
<td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOffshore"></span></strong></td>
</tr>
<tr></tr>
<tr class="effortEstimateRow hide">
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Onsite (In Person Days)</small></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOnsite"></span></strong></td>
</tr>
<tr></tr>
<tr>
Expand Down Expand Up @@ -342,8 +347,13 @@
</div>
<br/><br/>
<div class="effortEstimateRow">
<span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort<br/>(in Person Days):&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
<input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></span>
<input id="effortDaysEstimateOffshore" class="bigin" name="effortDaysEstimateOffshore" type="text" value="" />
</div>
<br/><br/>
<div class="effortEstimateRow">
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Onsite(In Person Days)</small></span>
<input id="effortDaysEstimateOnsite" class="bigin" name="effortDaysEstimateOnsite" type="text" value="" />
</div>
<br/><br/>
<span class="name fixWidthName"><strong>Created By</strong></span>
Expand Down
18 changes: 14 additions & 4 deletions src/web/WEB-INF/includes/contest/editTabMarathon.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,13 @@
</tr>
<tr></tr>
<tr class="effortEstimateRow hide">
<td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOffshore"></span></strong></td>
</tr>
<tr></tr>
<tr class="effortEstimateRow hide">
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Onsite (In Person Days)</small></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOnsite"></span></strong></td>
</tr>
<tr></tr>
<tr>
Expand Down Expand Up @@ -295,8 +300,13 @@
</div>
<br /><br />
<div class="effortEstimateRow">
<span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort<br/>(in Person Days):&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
<input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></span>
<input id="effortDaysEstimateOffshore" class="bigin" name="effortDaysEstimateOffshore" type="text" value="" />
</div>
<br/><br/>
<div class="effortEstimateRow">
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Onsite(In Person Days)</small></span>
<input id="effortDaysEstimateOnsite" class="bigin" name="effortDaysEstimateOnsite" type="text" value="" />
</div>
<br/><br/>
<span class="name fixWidthName"><strong>Created By</strong></span>
Expand Down
19 changes: 14 additions & 5 deletions src/web/WEB-INF/includes/contest/editTabSoftware.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,13 @@
</tr>
<tr></tr>
<tr class="effortEstimateRow hide">
<td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOffshore"></span></strong></td>
</tr>
<tr></tr>
<tr class="effortEstimateRow hide">
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Onsite (In Person Days)</small></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOnsite"></span></strong></td>
</tr>
<tr></tr>
<tr>
Expand Down Expand Up @@ -369,13 +374,17 @@
<br/>

<div class="effortEstimateRow">
<span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort<br/>(in Person Days):&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
<input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></span>
<input id="effortDaysEstimateOffshore" class="bigin" name="effortDaysEstimateOffshore" type="text" value="" />
</div>
<br/><br/>
<div class="effortEstimateRow">
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Onsite(In Person Days)</small></span>
<input id="effortDaysEstimateOnsite" class="bigin" name="effortDaysEstimateOnsite" type="text" value="" />
<br/>
<br/>
<br/>
</div>

<div>
<span class="name fixWidthName"><strong>Created By</strong></span>
<span class ='small_info_spec' id="challegneCreatorLabel"></span>
Expand Down
11 changes: 10 additions & 1 deletion src/web/WEB-INF/includes/launch/contestSelection.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,18 @@
<div id="groups"></div>
</div>
</div>
<div class="ms-row effortEstimateRow">
<%-- <div class="ms-row effortEstimateRow">
<label>Estimated Effort<br/>(in Person Days):&nbsp;&nbsp;<a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></label>
<input id="effortDaysEstimate" class="text" name="effortDaysEstimate" type="text"/>
</div> --%>

<div class="ms-row effortEstimateRow">
<label>Estimated Efforts: Offshore (In Person Days)</label>
<input id="effortDaysEstimateOffshore" class="text" name="effortDaysEstimateOffshore" type="text"/>
</div>
<div class="ms-row effortEstimateRow">
<label>Estimated Efforts: Onsite (In Person Days)</label>
<input id="effortDaysEstimateOnsite" class="text" name="effortDaysEstimateOnsite" type="text"/>
</div>
</div>
<!-- end .addNewContest -->
Expand Down
8 changes: 6 additions & 2 deletions src/web/WEB-INF/includes/launch/orderReview.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,13 @@
<td><span id="orStartDate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Days Estimate :</th>
<td><span id="orEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
<td><span id="orEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
<td><span id="orEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
</table>
</div>
<!-- end .overviewBox -->
Expand Down
8 changes: 6 additions & 2 deletions src/web/WEB-INF/includes/launch/orderReviewAlgorithm.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,13 @@
<td><span id="alorStartDate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Days Estimate :</th>
<td><span id="alorEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
<td><span id="alorEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
<td><span id="alorEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
</table>
</div>
<!-- end .overviewBox -->
Expand Down
8 changes: 6 additions & 2 deletions src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,13 @@
<td><span id="sworStartDate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Days Estimate :</th>
<td><span id="sworEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
<td><span id="sworEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
<td><span id="sworEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
</table>
</div>
<!-- end .overviewBox -->
Expand Down
10 changes: 8 additions & 2 deletions src/web/WEB-INF/includes/launch/review.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,14 @@
<td><a href="javascript:backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Days Estimate :</th>
<td><span id="rEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
<td><span id="rEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
<img src="/images/edit-icon.png" alt="Edit"/></a>
</td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
<td><span id="rEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
<img src="/images/edit-icon.png" alt="Edit"/></a>
</td>
</tr>
Expand Down
16 changes: 12 additions & 4 deletions src/web/WEB-INF/includes/launch/reviewAlgorithm.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,18 @@
<th>Group(s) :</th>
<td><a href="javascript:backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Days Estimate :</th>
<td><span id="ralEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
<td><span id="ralEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
<img src="/images/edit-icon.png" alt="Edit"/></a>
</td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
<td><span id="ralEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
<img src="/images/edit-icon.png" alt="Edit"/></a>
</td>
</tr>
</table>
</div>
<!-- End .overviewBox -->
Expand Down
16 changes: 12 additions & 4 deletions src/web/WEB-INF/includes/launch/reviewSoftware.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,18 @@
<th>Group(s) :</th>
<td><a href="javascript:backOverview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Days Estimate :</th>
<td><span id="rswEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
<td><span id="rswEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
<img src="/images/edit-icon.png" alt="Edit"/></a>
</td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
<td><span id="rswEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
<img src="/images/edit-icon.png" alt="Edit"/></a>
</td>
</tr>
</table>
</div>
<!-- End .overviewBox -->
Expand Down
27 changes: 18 additions & 9 deletions src/web/css/direct/launchcontest.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,13 +303,17 @@

/** label **/
#launchContestOut .addNewContest label {
width: 125px;
float: left;
display: inline;
margin-left: 14px;
font-family: "Source Sans Pro", Arial, Helvetica, sans-serif;
font-size: 14px;
line-height: 24px;
width: 125px;
float: left;
display: inline;
margin-left: 14px;
font-family: "Source Sans Pro", Arial, Helvetica, sans-serif;
font-size: 14px;
line-height: 24px;
}

#launchContestOut .addNewContest .effortEstimateRow label {
width: 270px;
}

#launchContestOut.launchCopilotContest .addNewContest label {
Expand All @@ -331,6 +335,10 @@
font-size: 12px;
}

#launchContestOut .addNewContest .effortEstimateRow .text {
width: 50px;
}

#launchContestOut.launchCopilotContest .addNewContest .text {
background: none;
width: 370px;
Expand Down Expand Up @@ -3256,8 +3264,9 @@ div.ms-group-display .ms-group-div{
margin-top: 17px;
}

.effortEstimateRow {
height: 50px;
.effortEstimateRow th {
line-height: 15px;
padding: 7px 0 7px 0;
}

.dropdown-menu {
Expand Down
25 changes: 12 additions & 13 deletions src/web/scripts/launch/contestDetailSoftware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,11 +608,6 @@ $(document).ready(function(){
}
}
});
$('.effortEstimateRow .helpme').hover(function() {
showPopup(this, 'effortDaysToolTip');
}, function() {
$('#effortDaysToolTip').hide();
});
});

var ACTIVE_PROJECT_STATUS = 1;
Expand Down Expand Up @@ -890,7 +885,8 @@ function initContest(contestJson) {
mainWidget.softwareCompetition.regEndDate = parseDate(contestJson.regEndDate);

$('#contestTypeNameText').text(getProjectCategoryById(mainWidget.softwareCompetition.projectHeader.projectCategory.id).name);
mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'] = contestJson.properties['Effort Hours Estimate'];
mainWidget.softwareCompetition.projectHeader.properties[ESTIMATE_EFFORT_OFFSHORE] = contestJson.properties[ESTIMATE_EFFORT_OFFSHORE];
mainWidget.softwareCompetition.projectHeader.properties[ESTIMATE_EFFORT_ONSITE] = contestJson.properties[ESTIMATE_EFFORT_ONSITE];

// copilots
var copilots = contestJson.copilots; // get copilots data from result
Expand Down Expand Up @@ -1437,14 +1433,17 @@ function populateTypeSection() {
$(".matchRoundId").show();
}

// change to days
var effortDaysEstimate = parseFloat(p['Effort Hours Estimate']) / 24;
if (!isNaN(effortDaysEstimate) && effortDaysEstimate > 0 ) {
$('#rEffortDaysEstimate').text(parseFloat(effortDaysEstimate));
$('input[name=effortDaysEstimate]').val(effortDaysEstimate);
$('.effortEstimateRow').show();
var effortDaysEstimateOffshore = p[ESTIMATE_EFFORT_OFFSHORE] || '';
var effortDaysEstimateOnsite = p[ESTIMATE_EFFORT_ONSITE] || '';
$('#rEffortDaysEstimateOffshore').text(effortDaysEstimateOffshore);
$('#rEffortDaysEstimateOnsite').text(effortDaysEstimateOnsite);
$('input[name=effortDaysEstimateOffshore]').val(effortDaysEstimateOffshore);
$('input[name=effortDaysEstimateOnsite]').val(effortDaysEstimateOnsite);

if (isNaN(p[ESTIMATE_EFFORT_OFFSHORE]) && isNaN(p[ESTIMATE_EFFORT_ONSITE]) ) {
$('.effortEstimateRow').hide();
} else {
$('#rEffortDaysEstimate').text('');
$('.effortEstimateRow').show();
}

if (mainWidget.softwareCompetition.projectHeader.properties.hasOwnProperty(MM_TYPE)) {
Expand Down
2 changes: 2 additions & 0 deletions src/web/scripts/launch/entity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@ var PRODUCT_SKU ="Product SKU";
var ENVIRONMENT = "Environment";
var CODE_REPO = "Code Repo";
var MM_TYPE = "Marathon Match Type";
var ESTIMATE_EFFORT_OFFSHORE = "Estimate Efforts Days Offshore";
var ESTIMATE_EFFORT_ONSITE = "Estimate Efforts Days Onsite";

var projectCategoryArray = [
{id:32, name:'Application Front-End Design', label:'Application Front-End Design', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: false},
Expand Down
Loading