Merge pull request #210 from AppliedIS/issue-admin-attachement-links

admin section attachment link updates
ais-open · Dec 2, 2016 · 3becb43 · 3becb43
2 parents 5f07b6b + 97bf543
commit 3becb43
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/DOL.WHD.Section14c.Web/src/modules/components/adminReview/adminReviewController.js b/DOL.WHD.Section14c.Web/src/modules/components/adminReview/adminReviewController.js
@@ -1,11 +1,12 @@
 'use strict';
 
 module.exports = function(ngModule) {
-    ngModule.controller('adminReviewController', function($scope, stateService) {
+    ngModule.controller('adminReviewController', function($scope, stateService, _constants) {
         'ngInject';
         'use strict';
 
         $scope.appData = stateService.appData;
+        $scope.constants = _constants;
 
         if ($scope.appid && $scope.appid !== $scope.appData.id) {
             stateService.loadApplicationData($scope.appid);

diff --git a/DOL.WHD.Section14c.Web/src/modules/components/answerField/answerFieldController.js b/DOL.WHD.Section14c.Web/src/modules/components/answerField/answerFieldController.js
@@ -6,7 +6,7 @@ module.exports = function(ngModule) {
         'use strict';
 
         var vm = this;
-        vm.attachmentApiURL = apiService.attachmentApiURL + stateService.ein;
+        vm.attachmentApiURL = apiService.attachmentApiURL;
         vm.access_token = stateService.access_token;
     });
 }
diff --git a/DOL.WHD.Section14c.Web/src/modules/components/answerField/answerFieldTemplate.html b/DOL.WHD.Section14c.Web/src/modules/components/answerField/answerFieldTemplate.html
@@ -15,7 +15,7 @@
             {{ answer | dateFilter }}
         </div>
         <div ng-show="attachmentField">
-            <a ng-href="{{vm.attachmentApiURL}}/{{answer.id}}?access_token={{vm.access_token}}"><span>{{answer.originalFileName}}</span></a>
+            <a ng-href="{{vm.attachmentApiURL}}{{answer.ein}}/{{answer.id}}?access_token={{vm.access_token}}"><span>{{answer.originalFileName}}</span></a>
         </div>
     </div>
     <div class="answer-answer" ng-show="answer === undefined">

diff --git a/...tion14c.Web/src/modules/components/sectionAdminEmployer/sectionAdminEmployerTemplate.html b/...tion14c.Web/src/modules/components/sectionAdminEmployer/sectionAdminEmployerTemplate.html
@@ -110,7 +110,7 @@ <h3>Government Contracts</h3>
         What is the total number of current SCA-covered contracts under which workers with disabilities are employed and earning subminimum wages?
     </answer-field>
 
-    <answer-field answer="appData.employer.scaAttachmentName" ng-show="appData.employer.scaId === constants.responses.sca.yes">
+    <answer-field answer="appData.employer.scaAttachment" attachment-field="true" ng-show="appData.employer.scaId === constants.responses.sca.yes">
         SCA Wage Determination Attachment
     </answer-field>
 

diff --git a/...tion14c.Web/src/modules/components/sectionAdminWageData/adminWageDataPayTypeTemplate.html b/...tion14c.Web/src/modules/components/sectionAdminWageData/adminWageDataPayTypeTemplate.html
@@ -52,6 +52,11 @@ <h3 ng-show="data.mostRecentPrevailingWageSurvey.sourceEmployers.length">Source
     <hr>
 </div>
 
+<answer-field answer="data.mostRecentPrevailingWageSurvey.attachment" attachment-field="true" ng-show="data.prevailingWageMethodId === $parent.constants.responses.prevailingWageMethod.survey">
+    If needed, attach an additional sheet headed "Prevailing Wage Determination-Hourly"
+</answer-field>
+
+
 <answer-field answer="data.alternateWageData.alternateWorkDescription" ng-show="data.prevailingWageMethodId === $parent.constants.responses.prevailingWageMethod.alternate">
     Description of Work (include job classification code, if known)
 </answer-field>