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

Commit e860808

Browse files
ajeftsajefts
authored
Merge pull request #472 from deedee/dev
Add Effort Estimates Offshore/Onsite fields
2 parents 8b9fbdc + f9eed8c commit e860808

18 files changed

+175
-105
lines changed

‎src/web/WEB-INF/includes/contest/editTab.jsp

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,13 @@
163163
</tr>
164164
<tr></tr>
165165
<tr class="effortEstimateRow hide">
166-
<td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
167-
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
166+
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></td>
167+
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOffshore"></span></strong></td>
168+
</tr>
169+
<tr></tr>
170+
<tr class="effortEstimateRow hide">
171+
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Onsite (In Person Days)</small></td>
172+
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOnsite"></span></strong></td>
168173
</tr>
169174
<tr></tr>
170175
<tr>
@@ -342,8 +347,13 @@
342347
</div>
343348
<br/><br/>
344349
<div class="effortEstimateRow">
345-
<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>
346-
<input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
350+
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></span>
351+
<input id="effortDaysEstimateOffshore" class="bigin" name="effortDaysEstimateOffshore" type="text" value="" />
352+
</div>
353+
<br/><br/>
354+
<div class="effortEstimateRow">
355+
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Onsite(In Person Days)</small></span>
356+
<input id="effortDaysEstimateOnsite" class="bigin" name="effortDaysEstimateOnsite" type="text" value="" />
347357
</div>
348358
<br/><br/>
349359
<span class="name fixWidthName"><strong>Created By</strong></span>

‎src/web/WEB-INF/includes/contest/editTabMarathon.jsp

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,13 @@
135135
</tr>
136136
<tr></tr>
137137
<tr class="effortEstimateRow hide">
138-
<td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
139-
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
138+
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></td>
139+
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOffshore"></span></strong></td>
140+
</tr>
141+
<tr></tr>
142+
<tr class="effortEstimateRow hide">
143+
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Onsite (In Person Days)</small></td>
144+
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOnsite"></span></strong></td>
140145
</tr>
141146
<tr></tr>
142147
<tr>
@@ -295,8 +300,13 @@
295300
</div>
296301
<br /><br />
297302
<div class="effortEstimateRow">
298-
<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>
299-
<input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
303+
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></span>
304+
<input id="effortDaysEstimateOffshore" class="bigin" name="effortDaysEstimateOffshore" type="text" value="" />
305+
</div>
306+
<br/><br/>
307+
<div class="effortEstimateRow">
308+
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Onsite(In Person Days)</small></span>
309+
<input id="effortDaysEstimateOnsite" class="bigin" name="effortDaysEstimateOnsite" type="text" value="" />
300310
</div>
301311
<br/><br/>
302312
<span class="name fixWidthName"><strong>Created By</strong></span>

‎src/web/WEB-INF/includes/contest/editTabSoftware.jsp

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,13 @@
185185
</tr>
186186
<tr></tr>
187187
<tr class="effortEstimateRow hide">
188-
<td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
189-
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
188+
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></td>
189+
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOffshore"></span></strong></td>
190+
</tr>
191+
<tr></tr>
192+
<tr class="effortEstimateRow hide">
193+
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Onsite (In Person Days)</small></td>
194+
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOnsite"></span></strong></td>
190195
</tr>
191196
<tr></tr>
192197
<tr>
@@ -369,13 +374,17 @@
369374
<br/>
370375

371376
<div class="effortEstimateRow">
372-
<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>
373-
<input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
377+
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></span>
378+
<input id="effortDaysEstimateOffshore" class="bigin" name="effortDaysEstimateOffshore" type="text" value="" />
379+
</div>
380+
<br/><br/>
381+
<div class="effortEstimateRow">
382+
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Onsite(In Person Days)</small></span>
383+
<input id="effortDaysEstimateOnsite" class="bigin" name="effortDaysEstimateOnsite" type="text" value="" />
374384
<br/>
375385
<br/>
376386
<br/>
377387
</div>
378-
379388
<div>
380389
<span class="name fixWidthName"><strong>Created By</strong></span>
381390
<span class ='small_info_spec' id="challegneCreatorLabel"></span>

‎src/web/WEB-INF/includes/launch/contestSelection.jsp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,18 @@
236236
<div id="groups"></div>
237237
</div>
238238
</div>
239-
<div class="ms-row effortEstimateRow">
239+
<%-- <div class="ms-row effortEstimateRow">
240240
<label>Estimated Effort<br/>(in Person Days):&nbsp;&nbsp;<a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></label>
241241
<input id="effortDaysEstimate" class="text" name="effortDaysEstimate" type="text"/>
242+
</div> --%>
243+
244+
<div class="ms-row effortEstimateRow">
245+
<label>Estimated Efforts: Offshore (In Person Days)</label>
246+
<input id="effortDaysEstimateOffshore" class="text" name="effortDaysEstimateOffshore" type="text"/>
247+
</div>
248+
<div class="ms-row effortEstimateRow">
249+
<label>Estimated Efforts: Onsite (In Person Days)</label>
250+
<input id="effortDaysEstimateOnsite" class="text" name="effortDaysEstimateOnsite" type="text"/>
242251
</div>
243252
</div>
244253
<!-- end .addNewContest -->

‎src/web/WEB-INF/includes/launch/orderReview.jsp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,13 @@
5959
<td><span id="orStartDate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
6060
</tr>
6161
<tr class="effortEstimateRow">
62-
<th>Effort Days Estimate :</th>
63-
<td><span id="orEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
62+
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
63+
<td><span id="orEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
6464
</tr>
65+
<tr class="effortEstimateRow">
66+
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
67+
<td><span id="orEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
68+
</tr>
6569
</table>
6670
</div>
6771
<!-- end .overviewBox -->

‎src/web/WEB-INF/includes/launch/orderReviewAlgorithm.jsp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,13 @@
4848
<td><span id="alorStartDate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
4949
</tr>
5050
<tr class="effortEstimateRow">
51-
<th>Effort Days Estimate :</th>
52-
<td><span id="alorEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
51+
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
52+
<td><span id="alorEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
5353
</tr>
54+
<tr class="effortEstimateRow">
55+
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
56+
<td><span id="alorEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
57+
</tr>
5458
</table>
5559
</div>
5660
<!-- end .overviewBox -->

‎src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,13 @@
6060
<td><span id="sworStartDate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
6161
</tr>
6262
<tr class="effortEstimateRow">
63-
<th>Effort Days Estimate :</th>
64-
<td><span id="sworEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
63+
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
64+
<td><span id="sworEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
6565
</tr>
66+
<tr class="effortEstimateRow">
67+
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
68+
<td><span id="sworEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
69+
</tr>
6670
</table>
6771
</div>
6872
<!-- end .overviewBox -->

‎src/web/WEB-INF/includes/launch/review.jsp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,14 @@
6868
<td><a href="javascript:backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
6969
</tr>
7070
<tr class="effortEstimateRow">
71-
<th>Effort Days Estimate :</th>
72-
<td><span id="rEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
71+
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
72+
<td><span id="rEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
73+
<img src="/images/edit-icon.png" alt="Edit"/></a>
74+
</td>
75+
</tr>
76+
<tr class="effortEstimateRow">
77+
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
78+
<td><span id="rEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
7379
<img src="/images/edit-icon.png" alt="Edit"/></a>
7480
</td>
7581
</tr>

‎src/web/WEB-INF/includes/launch/reviewAlgorithm.jsp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,18 @@
5353
<th>Group(s) :</th>
5454
<td><a href="javascript:backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
5555
</tr>
56-
<tr class="effortEstimateRow">
57-
<th>Effort Days Estimate :</th>
58-
<td><span id="ralEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
59-
</tr>
56+
<tr class="effortEstimateRow">
57+
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
58+
<td><span id="ralEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
59+
<img src="/images/edit-icon.png" alt="Edit"/></a>
60+
</td>
61+
</tr>
62+
<tr class="effortEstimateRow">
63+
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
64+
<td><span id="ralEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
65+
<img src="/images/edit-icon.png" alt="Edit"/></a>
66+
</td>
67+
</tr>
6068
</table>
6169
</div>
6270
<!-- End .overviewBox -->

‎src/web/WEB-INF/includes/launch/reviewSoftware.jsp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,18 @@
7171
<th>Group(s) :</th>
7272
<td><a href="javascript:backOverview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
7373
</tr>
74-
<tr class="effortEstimateRow">
75-
<th>Effort Days Estimate :</th>
76-
<td><span id="rswEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
77-
</tr>
74+
<tr class="effortEstimateRow">
75+
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
76+
<td><span id="rswEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
77+
<img src="/images/edit-icon.png" alt="Edit"/></a>
78+
</td>
79+
</tr>
80+
<tr class="effortEstimateRow">
81+
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
82+
<td><span id="rswEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
83+
<img src="/images/edit-icon.png" alt="Edit"/></a>
84+
</td>
85+
</tr>
7886
</table>
7987
</div>
8088
<!-- End .overviewBox -->

‎src/web/css/direct/launchcontest.css

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -303,13 +303,17 @@
303303

304304
/** label **/
305305
#launchContestOut .addNewContest label {
306-
width: 125px;
307-
float: left;
308-
display: inline;
309-
margin-left: 14px;
310-
font-family: "Source Sans Pro", Arial, Helvetica, sans-serif;
311-
font-size: 14px;
312-
line-height: 24px;
306+
width: 125px;
307+
float: left;
308+
display: inline;
309+
margin-left: 14px;
310+
font-family: "Source Sans Pro", Arial, Helvetica, sans-serif;
311+
font-size: 14px;
312+
line-height: 24px;
313+
}
314+
315+
#launchContestOut .addNewContest .effortEstimateRow label {
316+
width: 270px;
313317
}
314318

315319
#launchContestOut.launchCopilotContest .addNewContest label {
@@ -331,6 +335,10 @@
331335
font-size: 12px;
332336
}
333337

338+
#launchContestOut .addNewContest .effortEstimateRow .text {
339+
width: 50px;
340+
}
341+
334342
#launchContestOut.launchCopilotContest .addNewContest .text {
335343
background: none;
336344
width: 370px;
@@ -3256,8 +3264,9 @@ div.ms-group-display .ms-group-div{
32563264
margin-top: 17px;
32573265
}
32583266

3259-
.effortEstimateRow {
3260-
height: 50px;
3267+
.effortEstimateRow th {
3268+
line-height: 15px;
3269+
padding: 7px 0 7px 0;
32613270
}
32623271

32633272
.dropdown-menu {

‎src/web/scripts/launch/contestDetailSoftware.js

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -608,11 +608,6 @@ $(document).ready(function(){
608608
}
609609
}
610610
});
611-
$('.effortEstimateRow .helpme').hover(function() {
612-
showPopup(this, 'effortDaysToolTip');
613-
}, function() {
614-
$('#effortDaysToolTip').hide();
615-
});
616611
});
617612

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

892887
$('#contestTypeNameText').text(getProjectCategoryById(mainWidget.softwareCompetition.projectHeader.projectCategory.id).name);
893-
mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'] = contestJson.properties['Effort Hours Estimate'];
888+
mainWidget.softwareCompetition.projectHeader.properties[ESTIMATE_EFFORT_OFFSHORE] = contestJson.properties[ESTIMATE_EFFORT_OFFSHORE];
889+
mainWidget.softwareCompetition.projectHeader.properties[ESTIMATE_EFFORT_ONSITE] = contestJson.properties[ESTIMATE_EFFORT_ONSITE];
894890

895891
// copilots
896892
var copilots = contestJson.copilots; // get copilots data from result
@@ -1437,14 +1433,17 @@ function populateTypeSection() {
14371433
$(".matchRoundId").show();
14381434
}
14391435

1440-
// change to days
1441-
var effortDaysEstimate = parseFloat(p['Effort Hours Estimate']) / 24;
1442-
if (!isNaN(effortDaysEstimate) && effortDaysEstimate > 0 ) {
1443-
$('#rEffortDaysEstimate').text(parseFloat(effortDaysEstimate));
1444-
$('input[name=effortDaysEstimate]').val(effortDaysEstimate);
1445-
$('.effortEstimateRow').show();
1436+
var effortDaysEstimateOffshore = p[ESTIMATE_EFFORT_OFFSHORE] || '';
1437+
var effortDaysEstimateOnsite = p[ESTIMATE_EFFORT_ONSITE] || '';
1438+
$('#rEffortDaysEstimateOffshore').text(effortDaysEstimateOffshore);
1439+
$('#rEffortDaysEstimateOnsite').text(effortDaysEstimateOnsite);
1440+
$('input[name=effortDaysEstimateOffshore]').val(effortDaysEstimateOffshore);
1441+
$('input[name=effortDaysEstimateOnsite]').val(effortDaysEstimateOnsite);
1442+
1443+
if (isNaN(p[ESTIMATE_EFFORT_OFFSHORE]) && isNaN(p[ESTIMATE_EFFORT_ONSITE]) ) {
1444+
$('.effortEstimateRow').hide();
14461445
} else {
1447-
$('#rEffortDaysEstimate').text('');
1446+
$('.effortEstimateRow').show();
14481447
}
14491448

14501449
if (mainWidget.softwareCompetition.projectHeader.properties.hasOwnProperty(MM_TYPE)) {

‎src/web/scripts/launch/entity.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ var PRODUCT_SKU ="Product SKU";
209209
var ENVIRONMENT = "Environment";
210210
var CODE_REPO = "Code Repo";
211211
var MM_TYPE = "Marathon Match Type";
212+
var ESTIMATE_EFFORT_OFFSHORE = "Estimate Efforts Days Offshore";
213+
var ESTIMATE_EFFORT_ONSITE = "Estimate Efforts Days Onsite";
212214

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

0 commit comments

Comments
 (0)