Merge pull request #192 from AppliedIS/error-messaging

#108, #109 plus updates for #93 (msgs & help links)

DOL.WHD.Section14c.Web/src/modules/components/sectionEmployer/sectionEmployerTemplate.html

@@ -15,12 +15,13 @@ <h2>Employer</h2>
 <div class="form-page">
     <h3>Employer Information</h3>
     <hr />
-    <div class="form-question-block">
+    <div class="form-question-block" ng-class="validate('employer.legalName') ? 'usa-input-error' : ''">
         <div class="form-question-text">Legal Name of Employer
             <helplink></helplink>
             <helptext>Provide the full legal and trade name(s) of the employer, and previous name, if applicable. SWEPs should enter the identifying information for the school that is applying for the certificate.</helptext>
         </div>
         <div class="form-question-subtext">If applying for a certificate as a School Work Experience Program (SWEP), enter the identifying information for the school. </div>
+         <span class="usa-input-error-message" role="alert" ng-show="validate('employer.legalName')">{{ validate('employer.legalName') }}</span>
          <div class="form-question-answer">
             <input id="legalName" name="legalName" type="text" ng-model="formData.employer.legalName">
         </div>

DOL.WHD.Section14c.Web/src/modules/components/sectionWageData/sectionWageDataTemplate.html

@@ -39,27 +39,27 @@ <h2>Wage Data</h2>
 <div class="form-sidebar">
     <div class="links-block" ng-show="vm.showLinks === true">
         Prevailing Wage Calculators:<br>
-        <a href="">Straight or Simple Average</a><br>
-        <a href="">Weighted Average</a><br>
+        <a href="https://www.dol.gov/whd/sec14c/calculators/StraightAverage.htm" target="_blank">Straight or Simple Average</a><br>
+        <a href="https://www.dol.gov/whd/sec14c/calculators/WeightedAverage.htm" target="_blank">Weighted Average</a><br>
         <br>
         Commensurate Hourly Wage Calculators:<br>
-        <a href="">Rework</a><br>
-        <a href="">Wighted Tasks, Standard Weight Factor</a><br>
-        <a href="">Weighted Tasks, Ww/D Weight Factor</a><br>
-        <a href="">90/10 Form, Single Task, Variable Time</a><br>
-        <a href="">90/10 Form, Fixed Time, Variable Units</a><br>
+        <a href="https://www.dol.gov/whd/sec14c/calculators/Rework.htm" target="_blank">Rework</a><br>
+        <a href="https://www.dol.gov/whd/sec14c/calculators/WeightedTask_Standard.htm" target="_blank">Weighted Tasks, Standard Weight Factor</a><br>
+        <a href="https://www.dol.gov/whd/sec14c/calculators/WeightedTask_WwD.htm" target="_blank">Weighted Tasks, Ww/D Weight Factor</a><br>
+        <a href="https://www.dol.gov/whd/sec14c/calculators/90-10-Task_Var_Time.htm" target="_blank">90/10 Form, Single Task, Variable Time</a><br>
+        <a href="https://www.dol.gov/whd/sec14c/calculators/90-10-Task_Var_Units.htm" target="_blank">90/10 Form, Fixed Time, Variable Units</a><br>
         <br>
         Piece Rate - Number of Units in Standard Calculators:<br>
-        <a href="">Fixed Number of Units, PF&amp;D 9 min</a><br>
-        <a href="">Fixed Number of Units, PF&amp;D 10 min</a><br>
-        <a href="">Fixed Time, PF&amp;D 9 min</a><br>
-        <a href="">Fixed Time, PF&amp;D 10 min</a><br>
-        <a href="">Piece Rate Calculator</a><br>
+        <a href="https://www.dol.gov/whd/sec14c/calculators/FixedUnit_VariableTime9.htm" target="_blank">Fixed Number of Units, PF&amp;D 9 min</a><br>
+        <a href="https://www.dol.gov/whd/sec14c/calculators/FixedUnit_VariableTime10.htm" target="_blank">Fixed Number of Units, PF&amp;D 10 min</a><br>
+        <a href="https://www.dol.gov/whd/sec14c/calculators/FixedTime_VariableUnit9.htm" target="_blank">Fixed Time, PF&amp;D 9 min</a><br>
+        <a href="https://www.dol.gov/whd/sec14c/calculators/FixedTime_VariableUnit10.htm" target="_blank">Fixed Time, PF&amp;D 10 min</a><br>
+        <a href="https://www.dol.gov/whd/sec14c/calculators/PieceRate.htm" target="_blank">Piece Rate Calculator</a><br>
         <br>
         New Minimum Wage Calculator<br>
-        <a href="">New Prevailing Wage Calculator (Based on Minimum Wage Rate Change)</a><br>
+        <a href="https://www.dol.gov/whd/sec14c/calculators/NewMinimumWage.htm" target="_blank">New Prevailing Wage Calculator (Based on Minimum Wage Rate Change)</a><br>
         <br>
         User Guide<br>
-        <a href="">Section 14(c) Online Calculators User Guide (PDF)</a><br>
+        <a href="https://www.dol.gov/whd/specialemployment/calculatorGuide.pdf" target="_blank">Section 14(c) Online Calculators User Guide (PDF)</a><br>
     </div>
 </div>

DOL.WHD.Section14c.Web/src/modules/components/sectionWorkSites/sectionWorkSitesTemplate.html

@@ -175,7 +175,49 @@ <h4>Number of Employees: <strong>{{ vm.activeWorksite.numEmployees ? vm.activeWo
         </div>
 
         <div class="form-spaced-div">
-            <span>We'll need to collect specific information for each employee:</span>
+            <p>We'll need collect specific information for each employee.</p>
+            <p><a href="">See detailed instructions on employee information</a></p>
+
+            <div class="dol-help-employee-info">
+                <ul>
+                    <li><span>Full Name of Worker</span><span>Provide the full name of the worker.</span></li>
+                    <li><span>Primary Disability</span><span>Identify the primary disability that affects the worker's productivity for the job identified using the categories provided.</span></li>
+                    <li><span>Type of Work</span><span><p>Descibe the work peformed by this worker in the job for which the worker worked the most number of hours at a subminimum wage.</p><p>Examples may include: sewing, janitorial, box assembly, laundry, etc.</p></span></li>
+                    <li><span>Number of Jobs</span><span>If the worker performed more than one job at this work site during the most recently compelted fiscal quarter provide the total number of jobs.</span></li>
+                    <li><span>Average Hours per Week</span>
+                        <span>
+                            <p>Provide the average (mean) number of hours per week the employee worked on all jobs at this work site during the most recently completed fiscal quarter.</p>
+                            <p>Calculate this by taking the total number of hours the employee worked during the most recently completed three-month fiscal quarter and dividing by the number of weeks in the quarter (13 weeks).</p>
+                            <p>For example: 260 hours worked in the quarter ÷ 13 weeks per quarter = 20 hours per week average.</p>
+                        </span>
+                    </li>
+                    <li><span>Average Earnings per Hour</span>
+                        <span>
+                            <p>Average earnings are computed by dividing the total earnings of the individual worker by the total number of hours worked during the most recently completed fiscal quarter.</p>
+                            <p>Note:The total number of hours worked should only include the compensable work time (for example: generally would not include time spent in rehabilitation, therapy, etc.)</p>
+                            <p>For example, John Jones earned $900 during the fiscal quarter and he worked 300 hours. $900 ÷ 300 hours = $3.00 per hour, therefore, Mr. Jones's average earnings per hour are $3.00.</p>
+                        </span>
+                    </li>
+                    <li><span>Prevailing Wage</span><span>Provide the prevailing wage rate for the job identified.</span></li>
+                    <li><span>Productivity Measure</span>
+                        <span>
+                            <p>Provide the employee's most recent productivity rating the job identified.</p>
+                            <p>For work paid hourly, the productivity rating is the employee's productivity in proportion to the standard-setter's that was determined by the employee's time study.</p>
+                            <p>For piece rate work, no calculation is required, choose "n/a - piece rate".</p>
+                        </span>
+                    </li>
+                    <li><span>Commensurate Wage Rate</span>
+                        <span>
+                            <p>For work paid hourly, provide the employee's commensurate wage rate per hour for the job identified. This should be the wage rate actually paid to the worker for this job.</p>
+                            <p>For piece rate work, provide the employee's average earnings per hour for the job identified.</p>
+                        </span>
+                    </li>
+                    <li><span>Total Hours</span><span>Provide the employee's total hours worked on the job identified over the most recently completed fiscal quarter.</span></li>
+                    <li><span>Work at Other Site?</span><span>Answer "yes" if the employee also performed work at another work site included with this application. You must add the worker for each work site they worked at.</span></li>
+                </ul>
+            </div>
+
+            <!--<span>We'll need to collect specific information for each employee:</span>
             <ul class="compact-list">
                 <li>Name</li>
                 <li>Number of Jobs Performed at Work Site / Establishment</li>
@@ -188,7 +230,7 @@ <h4>Number of Employees: <strong>{{ vm.activeWorksite.numEmployees ? vm.activeWo
                 <li>Commensurate wage rate/average earnings per hour for job described</li>
                 <li>Total hours worked for job descirbed</li>
                 <li>Indicate if the worker performs work for this employer at any other work site</li>
-            </ul>
+            </ul>-->
         </div>
 
         <div class="form-question-group">
@@ -317,6 +359,14 @@ <h4>Number of Employees: <strong>{{ vm.activeWorksite.numEmployees ? vm.activeWo
             <div ng-class="vm.validateActiveWorksiteProperty('employee_count') ? 'usa-input-error' : ''">
                 <span class="usa-input-error-message" role="alert" ng-show="vm.validateActiveWorksiteProperty('employee_count')">{{ vm.validateActiveWorksiteProperty('employee_count') }}</span>
                 <div ng-hide="vm.addingEmployee"><button ng-click="vm.addingEmployee = true">Add Employee</button> <a href="" ng-click="">Show Me an Example</a></div>
+                <div class="dol-help-employee-example">
+                    <div class="dol-view-large">
+                        <img src="/images/add-employee-example-large.png" alt="">
+                    </div>
+                    <div class="dol-view-small">
+                        <img src="/images/add-employee-example-small.png" alt="">
+                    </div>
+                </div>
                 <table class="usa-table-borderless expandable-table" ng-show="vm.activeWorksite.employees.length">
                     <thead>
                         <tr>