@asd20/ui 3.2.503 → 3.2.505

package/package.json

@@ -5,7 +5,7 @@
     "*.scss",
     "*.vue"
   ],
-  "version": "3.2.503",
+  "version": "3.2.505",
   "private": false,
   "license": "MIT",
   "repository": {

package/src/components/templates/Asd20SalaryCalculatorTemplate/index.vue

@@ -83,7 +83,7 @@
 
     <!-- Salary Calculator -->
     <div class="salary-calculator">
-      <h2>Licensed Teacher Starting Salary Calculator</h2>
+      <h2 ref="scrollToMe">Licensed Teacher Starting Salary Calculator</h2>
       <p>(Includes Special Services Providers)</p>
       <asd20-select-input
         class="years-selector"
@@ -102,7 +102,10 @@
         :items="educationLevelOptions"
       />
       <asd20-button
-        @click.native="computedSalaryRange()"
+        @click.native="
+          computedSalaryRange()
+          scrollToElement()
+        "
         class="calculate"
         icon="chevron"
         label="Calculate"
@@ -243,7 +246,9 @@ export default {
         '14',
         '15',
         '16',
-        '17+',
+        '17',
+        '18',
+        '19+',
       ],
       educationLevel: "Bachelor's Degree",
       educationLevelOptions: [
@@ -264,360 +269,360 @@ export default {
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree",
           minYearsOfExperience: 0,
-          maxYearsOfExperience: 2,
-          minSalary: 42025,
-          maxSalary: 42025,
+          maxYearsOfExperience: 4,
+          minSalary: 45000,
+          maxSalary: 46000,
         },
         {
           id: '1',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree",
-          minYearsOfExperience: 3,
-          maxYearsOfExperience: 5,
-          minSalary: 42100,
-          maxSalary: 42500,
+          minYearsOfExperience: 5,
+          maxYearsOfExperience: 9,
+          minSalary: 46250,
+          maxSalary: 47375,
         },
         {
           id: '2',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree",
-          minYearsOfExperience: 6,
-          maxYearsOfExperience: 10,
-          minSalary: 42600,
-          maxSalary: 43800,
+          minYearsOfExperience: 10,
+          maxYearsOfExperience: 14,
+          minSalary: 47750,
+          maxSalary: 50225,
         },
         {
           id: '3',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree",
-          minYearsOfExperience: 11,
-          maxYearsOfExperience: 17,
-          minSalary: 44500,
-          maxSalary: 48900,
+          minYearsOfExperience: 15,
+          maxYearsOfExperience: 19,
+          minSalary: 50925,
+          maxSalary: 53825,
         },
         {
           id: '4',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree + 16 Credits",
           minYearsOfExperience: 0,
-          maxYearsOfExperience: 2,
-          minSalary: 43485,
-          maxSalary: 43485,
+          maxYearsOfExperience: 4,
+          minSalary: 46635,
+          maxSalary: 47635,
         },
         {
           id: '5',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree + 16 Credits",
-          minYearsOfExperience: 3,
-          maxYearsOfExperience: 5,
-          minSalary: 43600,
-          maxSalary: 43900,
+          minYearsOfExperience: 5,
+          maxYearsOfExperience: 9,
+          minSalary: 47885,
+          maxSalary: 49024,
         },
         {
           id: '6',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree + 16 Credits",
-          minYearsOfExperience: 6,
-          maxYearsOfExperience: 10,
-          minSalary: 44000,
-          maxSalary: 45300,
+          minYearsOfExperience: 10,
+          maxYearsOfExperience: 14,
+          minSalary: 49413,
+          maxSalary: 51971,
         },
         {
           id: '7',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree + 16 Credits",
-          minYearsOfExperience: 11,
-          maxYearsOfExperience: 17,
-          minSalary: 46000,
-          maxSalary: 50600,
+          minYearsOfExperience: 15,
+          maxYearsOfExperience: 19,
+          minSalary: 52964,
+          maxSalary: 55694,
         },
         {
           id: '8',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree + 32 Credits",
           minYearsOfExperience: 0,
-          maxYearsOfExperience: 2,
-          minSalary: 44944,
-          maxSalary: 44944,
+          maxYearsOfExperience: 4,
+          minSalary: 48270,
+          maxSalary: 49270,
         },
         {
           id: '9',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree + 32 Credits",
-          minYearsOfExperience: 3,
-          maxYearsOfExperience: 5,
-          minSalary: 45100,
-          maxSalary: 45400,
+          minYearsOfExperience: 5,
+          maxYearsOfExperience: 9,
+          minSalary: 49520,
+          maxSalary: 50673,
         },
         {
           id: '10',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree + 32 Credits",
-          minYearsOfExperience: 6,
-          maxYearsOfExperience: 10,
-          minSalary: 45500,
-          maxSalary: 46800,
+          minYearsOfExperience: 10,
+          maxYearsOfExperience: 14,
+          minSalary: 51076,
+          maxSalary: 53717,
         },
         {
           id: '11',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree + 32 Credits",
-          minYearsOfExperience: 11,
-          maxYearsOfExperience: 17,
-          minSalary: 47500,
-          maxSalary: 52300,
+          minYearsOfExperience: 15,
+          maxYearsOfExperience: 19,
+          minSalary: 54463,
+          maxSalary: 57563,
         },
         {
           id: '12',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree + 48 Credits",
           minYearsOfExperience: 0,
-          maxYearsOfExperience: 2,
-          minSalary: 46404,
-          maxSalary: 46404,
+          maxYearsOfExperience: 4,
+          minSalary: 49905,
+          maxSalary: 50905,
         },
         {
           id: '13',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree + 48 Credits",
-          minYearsOfExperience: 3,
-          maxYearsOfExperience: 5,
-          minSalary: 46500,
-          maxSalary: 46800,
+          minYearsOfExperience: 5,
+          maxYearsOfExperience: 9,
+          minSalary: 51155,
+          maxSalary: 52322,
         },
         {
           id: '14',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree + 48 Credits",
-          minYearsOfExperience: 6,
-          maxYearsOfExperience: 10,
-          minSalary: 47000,
-          maxSalary: 48300,
+          minYearsOfExperience: 10,
+          maxYearsOfExperience: 14,
+          minSalary: 52739,
+          maxSalary: 55463,
         },
         {
           id: '15',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Bachelor's Degree + 48 Credits",
-          minYearsOfExperience: 11,
-          maxYearsOfExperience: 17,
-          minSalary: 49100,
-          maxSalary: 54000,
+          minYearsOfExperience: 15,
+          maxYearsOfExperience: 19,
+          minSalary: 56232,
+          maxSalary: 59432,
         },
         {
           id: '16',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree",
           minYearsOfExperience: 0,
-          maxYearsOfExperience: 2,
-          minSalary: 47863,
-          maxSalary: 47863,
+          maxYearsOfExperience: 4,
+          minSalary: 51540,
+          maxSalary: 52540,
         },
         {
           id: '17',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree",
-          minYearsOfExperience: 3,
-          maxYearsOfExperience: 5,
-          minSalary: 48000,
-          maxSalary: 48300,
+          minYearsOfExperience: 5,
+          maxYearsOfExperience: 9,
+          minSalary: 52790,
+          maxSalary: 53971,
         },
         {
           id: '18',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree",
-          minYearsOfExperience: 6,
-          maxYearsOfExperience: 10,
-          minSalary: 48500,
-          maxSalary: 49800,
+          minYearsOfExperience: 10,
+          maxYearsOfExperience: 14,
+          minSalary: 54402,
+          maxSalary: 57209,
         },
         {
           id: '19',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree",
-          minYearsOfExperience: 11,
-          maxYearsOfExperience: 17,
-          minSalary: 50600,
-          maxSalary: 55700,
+          minYearsOfExperience: 15,
+          maxYearsOfExperience: 19,
+          minSalary: 58001,
+          maxSalary: 61301,
         },
         {
           id: '20',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree + 16 Credits",
           minYearsOfExperience: 0,
-          maxYearsOfExperience: 2,
-          minSalary: 49321,
-          maxSalary: 49321,
+          maxYearsOfExperience: 4,
+          minSalary: 53175,
+          maxSalary: 54175,
         },
         {
           id: '21',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree + 16 Credits",
-          minYearsOfExperience: 3,
-          maxYearsOfExperience: 5,
-          minSalary: 49400,
-          maxSalary: 49800,
+          minYearsOfExperience: 5,
+          maxYearsOfExperience: 9,
+          minSalary: 54425,
+          maxSalary: 55620,
         },
         {
           id: '22',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree + 16 Credits",
-          minYearsOfExperience: 6,
-          maxYearsOfExperience: 10,
-          minSalary: 50000,
-          maxSalary: 51400,
+          minYearsOfExperience: 10,
+          maxYearsOfExperience: 14,
+          minSalary: 56065,
+          maxSalary: 58955,
         },
         {
           id: '23',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree + 16 Credits",
-          minYearsOfExperience: 11,
-          maxYearsOfExperience: 17,
-          minSalary: 52200,
-          maxSalary: 57400,
+          minYearsOfExperience: 15,
+          maxYearsOfExperience: 19,
+          minSalary: 59770,
+          maxSalary: 63170,
         },
         {
           id: '24',
           scheduleTitle: 'Licensed Teacher',
-          requiredEducationLevel: "Master's Degree + 32 Credits",
+          requiredEducationLevel: "Master's Degree + 32 Credits/EdS",
           minYearsOfExperience: 0,
-          maxYearsOfExperience: 2,
-          minSalary: 50781,
-          maxSalary: 50781,
+          maxYearsOfExperience: 4,
+          minSalary: 54810,
+          maxSalary: 55810,
         },
         {
           id: '25',
           scheduleTitle: 'Licensed Teacher',
-          requiredEducationLevel: "Master's Degree + 32 Credits",
-          minYearsOfExperience: 3,
-          maxYearsOfExperience: 5,
-          minSalary: 50900,
-          maxSalary: 51300,
+          requiredEducationLevel: "Master's Degree + 32 Credits/EdS",
+          minYearsOfExperience: 5,
+          maxYearsOfExperience: 9,
+          minSalary: 56060,
+          maxSalary: 57269,
         },
         {
           id: '26',
           scheduleTitle: 'Licensed Teacher',
-          requiredEducationLevel: "Master's Degree + 32 Credits",
-          minYearsOfExperience: 6,
-          maxYearsOfExperience: 10,
-          minSalary: 51400,
-          maxSalary: 52900,
+          requiredEducationLevel: "Master's Degree + 32 Credits/EdS",
+          minYearsOfExperience: 10,
+          maxYearsOfExperience: 14,
+          minSalary: 57728,
+          maxSalary: 60701,
         },
         {
           id: '27',
           scheduleTitle: 'Licensed Teacher',
-          requiredEducationLevel: "Master's Degree + 32 Credits",
-          minYearsOfExperience: 11,
-          maxYearsOfExperience: 17,
-          minSalary: 53700,
-          maxSalary: 59100,
+          requiredEducationLevel: "Master's Degree + 32 Credits/EdS",
+          minYearsOfExperience: 15,
+          maxYearsOfExperience: 19,
+          minSalary: 61539,
+          maxSalary: 65039,
         },
         {
           id: '28',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree + 48 Credits",
           minYearsOfExperience: 0,
-          maxYearsOfExperience: 2,
-          minSalary: 52241,
-          maxSalary: 52241,
+          maxYearsOfExperience: 4,
+          minSalary: 56445,
+          maxSalary: 57445,
         },
         {
           id: '29',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree + 48 Credits",
-          minYearsOfExperience: 3,
-          maxYearsOfExperience: 5,
-          minSalary: 52400,
-          maxSalary: 52700,
+          minYearsOfExperience: 5,
+          maxYearsOfExperience: 9,
+          minSalary: 57695,
+          maxSalary: 58918,
         },
         {
           id: '30',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree + 48 Credits",
-          minYearsOfExperience: 6,
-          maxYearsOfExperience: 10,
-          minSalary: 52900,
-          maxSalary: 54400,
+          minYearsOfExperience: 10,
+          maxYearsOfExperience: 14,
+          minSalary: 59391,
+          maxSalary: 62447,
         },
         {
           id: '31',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree + 48 Credits",
-          minYearsOfExperience: 11,
-          maxYearsOfExperience: 17,
-          minSalary: 55300,
-          maxSalary: 60800,
+          minYearsOfExperience: 15,
+          maxYearsOfExperience: 19,
+          minSalary: 63308,
+          maxSalary: 66908,
         },
         {
           id: '32',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree + 64 Credits",
           minYearsOfExperience: 0,
-          maxYearsOfExperience: 2,
-          minSalary: 53700,
-          maxSalary: 53700,
+          maxYearsOfExperience: 4,
+          minSalary: 58080,
+          maxSalary: 59080,
         },
         {
           id: '33',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree + 64 Credits",
-          minYearsOfExperience: 3,
-          maxYearsOfExperience: 5,
-          minSalary: 53800,
-          maxSalary: 54200,
+          minYearsOfExperience: 5,
+          maxYearsOfExperience: 9,
+          minSalary: 59330,
+          maxSalary: 60567,
         },
         {
           id: '34',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree + 64 Credits",
-          minYearsOfExperience: 6,
-          maxYearsOfExperience: 10,
-          minSalary: 54400,
-          maxSalary: 55900,
+          minYearsOfExperience: 10,
+          maxYearsOfExperience: 14,
+          minSalary: 61054,
+          maxSalary: 64193,
         },
         {
           id: '35',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: "Master's Degree + 64 Credits",
-          minYearsOfExperience: 11,
-          maxYearsOfExperience: 17,
-          minSalary: 56800,
-          maxSalary: 62500,
+          minYearsOfExperience: 15,
+          maxYearsOfExperience: 19,
+          minSalary: 65077,
+          maxSalary: 68777,
         },
         {
           id: '36',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: 'Ph.D./Ed.D. or higher',
           minYearsOfExperience: 0,
-          maxYearsOfExperience: 2,
-          minSalary: 55160,
-          maxSalary: 55160,
+          maxYearsOfExperience: 4,
+          minSalary: 59715,
+          maxSalary: 60715,
         },
         {
           id: '37',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: 'Ph.D./Ed.D. or higher',
-          minYearsOfExperience: 3,
-          maxYearsOfExperience: 5,
-          minSalary: 55300,
-          maxSalary: 55700,
+          minYearsOfExperience: 5,
+          maxYearsOfExperience: 9,
+          minSalary: 60965,
+          maxSalary: 62216,
         },
         {
           id: '38',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: 'Ph.D./Ed.D. or higher',
-          minYearsOfExperience: 6,
-          maxYearsOfExperience: 10,
-          minSalary: 55900,
-          maxSalary: 57400,
+          minYearsOfExperience: 10,
+          maxYearsOfExperience: 14,
+          minSalary: 62717,
+          maxSalary: 65939,
         },
         {
           id: '39',
           scheduleTitle: 'Licensed Teacher',
           requiredEducationLevel: 'Ph.D./Ed.D. or higher',
-          minYearsOfExperience: 11,
-          maxYearsOfExperience: 17,
-          minSalary: 58400,
-          maxSalary: 64200,
+          minYearsOfExperience: 15,
+          maxYearsOfExperience: 19,
+          minSalary: 66846,
+          maxSalary: 70646,
         },
       ],
       minSalary: 0,
@@ -630,20 +635,28 @@ export default {
       const salaryRangesByEducationLevel = this.salaryRanges.filter(
         s => s.requiredEducationLevel === this.educationLevel
       )
-      console.log(this.educationLevel)
-      console.log(salaryRangesByEducationLevel)
+      // console.log(this.educationLevel)
+      // console.log(salaryRangesByEducationLevel)
 
       const salaryRangesByExperience = salaryRangesByEducationLevel
         .filter(smin => smin.minYearsOfExperience <= numberOfYears)
         .filter(smax => smax.maxYearsOfExperience >= numberOfYears)
-      console.log(this.years, numberOfYears)
-      console.log(salaryRangesByExperience)
+      // console.log(this.years, numberOfYears)
+      // console.log(salaryRangesByExperience)
 
       this.minSalary = salaryRangesByExperience[0].minSalary
       this.maxSalary = salaryRangesByExperience[0].maxSalary
 
-      console.log(salaryRangesByExperience[0].minSalary)
-      console.log(this.minSalary)
+      // console.log(salaryRangesByExperience[0].minSalary)
+      // console.log(this.minSalary)
+    },
+    scrollToElement() {
+      const el = this.$refs.scrollToMe
+
+      if (el) {
+        // Use el.scrollIntoView() to instantly scroll to the element
+        el.scrollIntoView({ behavior: 'smooth' })
+      }
     },
   },
 }