Increase and unify budget (#189)

salsita · Jun 28, 2022 · 97a397e · 97a397e
1 parent fd8c2a8
commit 97a397e
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 7 deletions.
diff --git a/admin-scripts/lib/budget-updates.spec.js b/admin-scripts/lib/budget-updates.spec.js
@@ -27,7 +27,19 @@ years.forEach((y) => {
     const resultsPart = [];
     const resultsFull = [];
     let yy;
-    if (date >= '2021-08-01') {
+    if (date >= '2022-07-01') {
+      resultsPart.push({
+        action: 'initial',
+        amount: 75000,
+        date,
+      });
+      resultsFull.push({
+        action: 'initial',
+        amount: 75000,
+        date,
+      });
+      yy = y + 2;
+    } else if (date >= '2021-08-01') {
       resultsPart.push({
         action: 'initial',
         amount: 55000,
@@ -70,14 +82,20 @@ years.forEach((y) => {
       const act = `${yy}-${d}`;
       if (act >= '2015-04-01') {
         let partIncreaseAmount;
-        if (act >= '2021-08-01') {
-          partIncreaseAmount = 21000;
-        } else if (act >= '2019-08-01') {
-          partIncreaseAmount = 12500;
+        let fullIncreaseAmount;
+        if (act >= '2022-07-01') {
+          partIncreaseAmount = 30000;
+          fullIncreaseAmount = 30000;
         } else {
-          partIncreaseAmount = 11250;
+          if (act >= '2021-08-01') {
+            partIncreaseAmount = 21000;
+          } else if (act >= '2019-08-01') {
+            partIncreaseAmount = 12500;
+          } else {
+            partIncreaseAmount = 11250;
+          }
+          fullIncreaseAmount = act >= '2019-08-01' ? 25000 : 22500;
         }
-        const fullIncreaseAmount = act >= '2019-08-01' ? 25000 : 22500;
 
         resultsPart.push({
           action: 'yearly',

diff --git a/admin-scripts/lib/config.js b/admin-scripts/lib/config.js
@@ -3,6 +3,7 @@ const budgetNames = {
   PERIOD1: 'period1',
   PERIOD2: 'period2',
   PERIOD3: 'period3',
+  PERIOD4: 'period4',
 };
 
 const budgetStartDate = '2015-04-01'; // when the budget calculation starts
@@ -70,6 +71,21 @@ const config = {
         },
         name: budgetNames.PERIOD3,
         firstIncreaseYears: 2,
+        validUntil: '2022-07-01',
+      },
+      {
+        initial: {
+          // initial budget
+          fullTime: 75000,
+          partTime: 75000,
+        },
+        yearly: {
+          // yearly increase
+          fullTime: 30000,
+          partTime: 30000,
+        },
+        name: budgetNames.PERIOD4,
+        firstIncreaseYears: 2,
         validUntil: '2999-12-31',
       },
     ],