Merge branch '2021' into prod

2021/backpayCalc.html

@@ -5,7 +5,7 @@
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 		<!-- <meta content="width=device-width,initial-scale=1" name="viewport"> -->
-		<title>Backpay Calculator for 2021 IT Collective Agreement</title>
+		<title>Backpay Calculator for 2021 IT Tentative Agreement</title>
 		<meta name="dc.title" content="Test of backpayCalc">
 		<meta name="dcterms.title" content="Test of backpayCalc">
 		<link rel="Stylesheet" type="text/css" href="../backpayCalc.css" >
@@ -16,14 +16,14 @@
 			<li><a href="#resultsDiv">Skip to Results</a></li>
 		</ul>
 		<header>
-			<h1>Backpay Calculator for 2021 IT CA</h1>
+			<h1>Backpay Calculator for 2021 IT TA</h1>
 		</header>
 		<main>
 		<details>
 		<summary><h2 class="summary">How this calculator works</h2></summary>
 		<p>After entering in all your details this calculator breaks everything down into <dfn>periods</dfn> which are ranges of dates with the same yearly, hourly, and/or daily rate of pay.</p>
-		<p>For example, let's say you became an IT-02 (step 1) on August 1, 2019. This collective agreement will come into effect on <time datetime="2021-12-22">December 22, 2021</time>.  No backpay will be calculated before the start date of the collective agreement.  So, from <time datetime="2021-12-22">December 22, 2021</time> to  <time datetime="2022-07-31">July 31, 2022</time> your annual rate of pay will be $75&nbsp;129. That's the first period. Then on  <time datetime="2022-08-01">August 1, 2022</time> you have your 1 year anniversary as an IT-02 and you move up to step 2.  From <time datetime="2022-08-01">August 1, 2022</time> to <time datetime="2022-12-21">December 21, 2022</time> you'll have an annual rate of pay of $77&nbsp;535.  That's the second period.</p>
-		<p>If you start an Acting period, that starts a new period which goes until your pay changes again, either through a raise in the collective agreement, the end of your Acting period, or an anniversary raise.</p>
+		<p>For example, let's say you became an IT-02 (step 1) on August 1, 2019. This tentative agreement would come into effect on <time datetime="2021-12-22">December 22, 2021</time>.  No backpay will be calculated before the start date of the tentative agreement.  So, from <time datetime="2021-12-22">December 22, 2021</time> to  <time datetime="2022-07-31">July 31, 2022</time> your annual rate of pay will be $75&nbsp;129. That's the first period. Then on  <time datetime="2022-08-01">August 1, 2022</time> you have your 1 year anniversary as an IT-02 and you move up to step 2.  From <time datetime="2022-08-01">August 1, 2022</time> to <time datetime="2022-12-21">December 21, 2022</time> you'll have an annual rate of pay of $77&nbsp;535.  That's the second period.</p>
+		<p>If you start an Acting period, that starts a new period which goes until your pay changes again, either through a raise in the tentative agreement, the end of your Acting period, or an anniversary raise.</p>
 		<p>Anything which causes a change in your rate of pay starts a new period.  And the period lasts as long as you're at that rate of pay.</p>
 		<p>When you click "Calculate", the calculator takes your yearly rate of pay to get what step you're at, and when your anniversary date is (if you're not yet at the highest step).  It takes all your acting periods, and leave-without-pay periods and creates a succession of periods each with its own rate of pay.  Then for each of those periods it calculates what you did make (based on the top rates in the last collective agreement), and what you would have made had the current offer/tentative agreement been signed by the start date of that agreement.  The Results table, which appears below the Calculate button after it's clicked, shows these, and the difference, your level, your step your rate of pay, and the number used to calculate that rate of pay.</p>
 		<p>For each of those periods the calculator counts the weekdays in the period and multiplies that by the daily rate of pay at that step.  <strong>This calculator assumes you work full time hours on a regular schedule.  This will not work for those on part time schedules, or who work erratic schedule.</strong></p>