FundImpact · htimali · Jul 30, 2021 · Jul 30, 2021 · Jul 30, 2021 · Aug 3, 2021
diff --git a/.gitignore b/.gitignore
@@ -94,6 +94,8 @@ logs
 results
 node_modules
 .node_history
+package-lock.json
+yarn.lock
 
 
 ############################

diff --git a/api/.gitkeep b/api/.gitkeep
diff --git a/api/account/config/routes.json b/api/account/config/routes.json
diff --git a/api/account/controllers/account.js b/api/account/controllers/account.js
diff --git a/api/account/documentation/1.0.0/account.json b/api/account/documentation/1.0.0/account.json
diff --git a/api/account/models/account.js b/api/account/models/account.js
diff --git a/api/account/models/account.settings.json b/api/account/models/account.settings.json
diff --git a/api/account/services/account.js b/api/account/services/account.js
diff --git a/api/annual-year/config/routes.json b/api/annual-year/config/routes.json
diff --git a/api/annual-year/config/schema.graphql.js b/api/annual-year/config/schema.graphql.js
diff --git a/api/annual-year/controllers/annual-year.js b/api/annual-year/controllers/annual-year.js
diff --git a/api/annual-year/documentation/1.0.0/annual-year.json b/api/annual-year/documentation/1.0.0/annual-year.json
diff --git a/api/annual-year/models/annual-year.js b/api/annual-year/models/annual-year.js
diff --git a/api/annual-year/models/annual-year.settings.json b/api/annual-year/models/annual-year.settings.json
diff --git a/api/annual-year/services/annual-year.js b/api/annual-year/services/annual-year.js
diff --git a/api/block/config/routes.json b/api/block/config/routes.json
diff --git a/api/block/controllers/block.js b/api/block/controllers/block.js
diff --git a/api/block/models/block.js b/api/block/models/block.js
diff --git a/api/block/models/block.settings.json b/api/block/models/block.settings.json
@@ -27,6 +27,10 @@
     "villages": {
       "via": "block",
       "collection": "village"
+    },
+    "geo_regions": {
+      "via": "block_id",
+      "collection": "geo-regions"
     }
   }
 }
diff --git a/api/block/services/block.js b/api/block/services/block.js
diff --git a/api/budget-category-organization/config/policies/addFilter.js b/api/budget-category-organization/config/policies/addFilter.js
diff --git a/...udget-category-organization/config/policies/isBudgetCategoryAssociatedWithBudgetTarget.js b/...udget-category-organization/config/policies/isBudgetCategoryAssociatedWithBudgetTarget.js
diff --git a/api/budget-category-organization/config/routes.json b/api/budget-category-organization/config/routes.json
diff --git a/api/budget-category-organization/config/schema.graphql.js b/api/budget-category-organization/config/schema.graphql.js
diff --git a/api/budget-category-organization/controllers/budget-category-organization.js b/api/budget-category-organization/controllers/budget-category-organization.js
diff --git a/api/budget-category-organization/models/budget-category-organization.js b/api/budget-category-organization/models/budget-category-organization.js
diff --git a/api/budget-category-organization/models/budget-category-organization.settings.json b/api/budget-category-organization/models/budget-category-organization.settings.json
@@ -26,6 +26,10 @@
     "deleted": {
       "type": "boolean",
       "default": false
+    },
+    "project_id": {
+      "via": "budget_category_organizations",
+      "model": "project"
     }
   }
 }
diff --git a/api/budget-category-organization/services/budget-category-organization.js b/api/budget-category-organization/services/budget-category-organization.js
diff --git a/api/budget-sub-target/config/routes.json b/api/budget-sub-target/config/routes.json
@@ -0,0 +1,52 @@
+{
+  "routes": [
+    {
+      "method": "GET",
+      "path": "/budget-sub-targets",
+      "handler": "budget-sub-target.find",
+      "config": {
+        "policies": []
+      }
+    },
+    {
+      "method": "GET",
+      "path": "/budget-sub-targets/count",
+      "handler": "budget-sub-target.count",
+      "config": {
+        "policies": []
+      }
+    },
+    {
+      "method": "GET",
+      "path": "/budget-sub-targets/:id",
+      "handler": "budget-sub-target.findOne",
+      "config": {
+        "policies": []
+      }
+    },
+    {
+      "method": "POST",
+      "path": "/budget-sub-targets",
+      "handler": "budget-sub-target.create",
+      "config": {
+        "policies": []
+      }
+    },
+    {
+      "method": "PUT",
+      "path": "/budget-sub-targets/:id",
+      "handler": "budget-sub-target.update",
+      "config": {
+        "policies": []
+      }
+    },
+    {
+      "method": "DELETE",
+      "path": "/budget-sub-targets/:id",
+      "handler": "budget-sub-target.delete",
+      "config": {
+        "policies": []
+      }
+    }
+  ]
+}
diff --git a/api/budget-sub-target/controllers/budget-sub-target.js b/api/budget-sub-target/controllers/budget-sub-target.js
@@ -0,0 +1,8 @@
+'use strict';
+
+/**
+ * Read the documentation (https://strapi.io/documentation/v3.x/concepts/controllers.html#core-controllers)
+ * to customize this controller
+ */
+
+module.exports = {};
diff --git a/api/budget-sub-target/models/budget-sub-target.js b/api/budget-sub-target/models/budget-sub-target.js
@@ -0,0 +1,8 @@
+'use strict';
+
+/**
+ * Read the documentation (https://strapi.io/documentation/v3.x/concepts/models.html#lifecycle-hooks)
+ * to customize this model
+ */
+
+module.exports = {};
diff --git a/api/budget-sub-target/models/budget-sub-target.settings.json b/api/budget-sub-target/models/budget-sub-target.settings.json
@@ -0,0 +1,50 @@
+{
+  "kind": "collectionType",
+  "collectionName": "budget_sub_targets",
+  "info": {
+    "name": "Budget Sub Target"
+  },
+  "options": {
+    "increments": true,
+    "timestamps": true
+  },
+  "attributes": {
+    "project": {
+      "model": "project"
+    },
+    "budget_targets_project": {
+      "model": "budget-targets-project"
+    },
+    "target_value": {
+      "type": "float"
+    },
+    "deleted": {
+      "type": "boolean",
+      "default": false
+    },
+    "timeperiod_start": {
+      "type": "date"
+    },
+    "timeperiod_end": {
+      "type": "date"
+    },
+    "donor": {
+      "model": "donor"
+    },
+    "grant_periods_project": {
+      "model": "grant-periods-project"
+    },
+    "financial_year_org": {
+      "model": "year-tag"
+    },
+    "financial_year_donor": {
+      "model": "year-tag"
+    },
+    "annual_year": {
+      "model": "year-tag"
+    },
+    "name": {
+      "type": "string"
+    }
+  }
+}
diff --git a/api/budget-sub-target/services/budget-sub-target.js b/api/budget-sub-target/services/budget-sub-target.js
@@ -0,0 +1,8 @@
+'use strict';
+
+/**
+ * Read the documentation (https://strapi.io/documentation/v3.x/concepts/services.html#core-services)
+ * to customize this service
+ */
+
+module.exports = {};
diff --git a/api/budget-targets-project/config/policies/addFilter.js b/api/budget-targets-project/config/policies/addFilter.js
diff --git a/api/budget-targets-project/config/routes.json b/api/budget-targets-project/config/routes.json
diff --git a/api/budget-targets-project/config/schema.graphql.js b/api/budget-targets-project/config/schema.graphql.js
diff --git a/api/budget-targets-project/controllers/budget-targets-project.js b/api/budget-targets-project/controllers/budget-targets-project.js
diff --git a/api/budget-targets-project/documentation/1.0.0/budget-targets-project.json b/api/budget-targets-project/documentation/1.0.0/budget-targets-project.json
diff --git a/api/budget-targets-project/models/budget-targets-project.js b/api/budget-targets-project/models/budget-targets-project.js
diff --git a/api/budget-targets-project/models/budget-targets-project.settings.json b/api/budget-targets-project/models/budget-targets-project.settings.json
@@ -33,6 +33,10 @@
     "deleted": {
       "type": "boolean",
       "default": false
+    },
+    "project_with_budget_targets": {
+      "collection": "project-with-budget-target",
+      "via": "budget_targets_project"
     }
   }
 }
diff --git a/api/budget-targets-project/services/budget-targets-project.js b/api/budget-targets-project/services/budget-targets-project.js
@@ -8,7 +8,7 @@
 module.exports = {
     totalTargetExpense: async ctx => {
         try {
-            let sumData = await strapi.connections.default.raw(`SELECT SUM(total_target_amount) FROM budget_targets_project where project = ${ctx.params.where.project} and COALESCE(budget_targets_project.deleted, false) <> true`)
+            let sumData = await strapi.connections.default.raw(`SELECT SUM(target_value) FROM budget_sub_targets where project = ${ctx.params.where.project} and COALESCE(budget_sub_targets.deleted, false) <> true`)
             return sumData.rows && sumData.rows.length > 0 && sumData.rows[0].sum != null ? sumData.rows[0].sum : 0;
         } catch (error) {
             return ctx.badRequest(null, error.message);

diff --git a/api/budget-tracking-lineitem/config/policies/addFilter.js b/api/budget-tracking-lineitem/config/policies/addFilter.js
diff --git a/api/budget-tracking-lineitem/config/routes.json b/api/budget-tracking-lineitem/config/routes.json
diff --git a/api/budget-tracking-lineitem/config/schema.graphql.js b/api/budget-tracking-lineitem/config/schema.graphql.js
diff --git a/api/budget-tracking-lineitem/controllers/budget-tracking-lineitem.js b/api/budget-tracking-lineitem/controllers/budget-tracking-lineitem.js
diff --git a/api/budget-tracking-lineitem/documentation/1.0.0/budget-tracking-lineitem.json b/api/budget-tracking-lineitem/documentation/1.0.0/budget-tracking-lineitem.json
diff --git a/api/budget-tracking-lineitem/models/budget-tracking-lineitem.js b/api/budget-tracking-lineitem/models/budget-tracking-lineitem.js
diff --git a/api/budget-tracking-lineitem/models/budget-tracking-lineitem.settings.json b/api/budget-tracking-lineitem/models/budget-tracking-lineitem.settings.json
@@ -13,7 +13,7 @@
       "model": "budget-targets-project"
     },
     "annual_year": {
-      "model": "annual-year"
+      "model": "year-tag"
     },
     "grant_periods_project": {
       "model": "grant-periods-project"
@@ -47,6 +47,21 @@
     "deleted": {
       "type": "boolean",
       "default": false
+    },
+    "budget_sub_target": {
+      "model": "budget-sub-target"
+    },
+    "timeperiod_start": {
+      "type": "date"
+    },
+    "timeperiod_end": {
+      "type": "date"
+    },
+    "financial_year_org": {
+      "model": "year-tag"
+    },
+    "financial_year_donor": {
+      "model": "year-tag"
     }
   }
 }
diff --git a/api/budget-tracking-lineitem/services/budget-tracking-lineitem.js b/api/budget-tracking-lineitem/services/budget-tracking-lineitem.js
@@ -1,36 +1,53 @@
-'use strict';
+"use strict";
 
 /**
  * Read the documentation (https://strapi.io/documentation/v3.x/concepts/services.html#core-services)
  * to customize this service
  */
 
 module.exports = {
-    spendAmount: async ctx => {
-        try {
-            let sumData = await strapi.connections.default.raw(`SELECT SUM(amount) FROM budget_tracking_lineitem where budget_targets_project = ${ctx.params.where.budgetTargetsProject} and COALESCE(deleted, false) <> true`)
-            return sumData.rows && sumData.rows.length > 0 && sumData.rows[0].sum != null ? sumData.rows[0].sum : 0;
-        } catch (error) {
-            console.log(error)
-            return ctx.badRequest(null, error.message);
-
-        }
-    },
-    totalSpendAmountByProject: async ctx => {
-        try {
-            console.log( ctx.params.where);
-            let budget_targets_projectIds = await strapi.query("budget-targets-project").find({project : ctx.params.where.project, _limit: 1000 })
-            let sumData  = 0;
-            budget_targets_projectIds = budget_targets_projectIds.filter(m => !m.deleted).map(m => m.id);
-            if(budget_targets_projectIds.length > 0){
-                budget_targets_projectIds = budget_targets_projectIds.map(x => "'" + x + "'").toString();
-                sumData = await strapi.connections.default.raw(`SELECT SUM(amount) FROM budget_tracking_lineitem where budget_targets_project IN (${budget_targets_projectIds}) and COALESCE(budget_tracking_lineitem.deleted, false) <> true`)
-            }
-            return sumData.rows && sumData.rows.length > 0 && sumData.rows[0].sum != null ? sumData.rows[0].sum : 0;
-        } catch (error) {
-            console.log(error)
-            return ctx.badRequest(null, error.message);
-        }
-    },
-
+  spendAmount: async (ctx) => {
+    try {
+      let sumData = await strapi.connections.default.raw(
+        `SELECT SUM(amount) FROM budget_tracking_lineitem where budget_targets_project = ${ctx.params.where.budgetTargetsProject} and COALESCE(deleted, false) <> true`
+      );
+      return sumData.rows &&
+        sumData.rows.length > 0 &&
+        sumData.rows[0].sum != null
+        ? sumData.rows[0].sum
+        : 0;
+    } catch (error) {
+      console.log(error);
+      return ctx.badRequest(null, error.message);
+    }
+  },
+  totalSpendAmountByProject: async (ctx) => {
+    try {
+      console.log(ctx.params.where);
+      let budget_sub_targets_projectIds = await strapi
+        .query("budget-sub-target")
+        .find({ project: ctx.params.where.project, _limit: 1000 });
+      console.log('budget-sub-target',budget_sub_targets_projectIds.length,budget_sub_targets_projectIds)  
+      let sumData = 0;
+      budget_sub_targets_projectIds = budget_sub_targets_projectIds
+        .filter((m) => !m.deleted)
+        .map((m) => m.id);
+      if (budget_sub_targets_projectIds.length > 0) {
+        budget_sub_targets_projectIds = budget_sub_targets_projectIds
+          .map((x) => "'" + x + "'")
+          .toString();
+        sumData = await strapi.connections.default.raw(
+          `SELECT SUM(amount) FROM budget_tracking_lineitem where budget_sub_target IN (${budget_sub_targets_projectIds}) and COALESCE(budget_tracking_lineitem.deleted, false) <> true`
+        );
+      }
+      return sumData.rows &&
+        sumData.rows.length > 0 &&
+        sumData.rows[0].sum != null
+        ? sumData.rows[0].sum
+        : 0;
+    } catch (error) {
+      console.log(error);
+      return ctx.badRequest(null, error.message);
+    }
+  },
 };
diff --git a/api/category-unit/config/routes.json b/api/category-unit/config/routes.json
diff --git a/api/category-unit/config/schema.graphql.js b/api/category-unit/config/schema.graphql.js
diff --git a/api/category-unit/controllers/category-unit.js b/api/category-unit/controllers/category-unit.js
diff --git a/api/category-unit/models/category-unit.js b/api/category-unit/models/category-unit.js
diff --git a/api/category-unit/models/category-unit.settings.json b/api/category-unit/models/category-unit.settings.json
diff --git a/api/category-unit/services/category-unit.js b/api/category-unit/services/category-unit.js
diff --git a/api/category/config/routes.json b/api/category/config/routes.json
diff --git a/api/category/config/schema.graphql.js b/api/category/config/schema.graphql.js
diff --git a/api/category/controllers/category.js b/api/category/controllers/category.js
diff --git a/api/category/models/category.js b/api/category/models/category.js
diff --git a/api/category/models/category.settings.json b/api/category/models/category.settings.json
diff --git a/api/category/services/category.js b/api/category/services/category.js
diff --git a/api/configuration/config/routes.json b/api/configuration/config/routes.json
diff --git a/api/configuration/controllers/configuration.js b/api/configuration/controllers/configuration.js
diff --git a/api/cost-categories/config/routes.json b/api/cost-categories/config/routes.json
@@ -0,0 +1,52 @@
+{
+  "routes": [
+    {
+      "method": "GET",
+      "path": "/cost-categories",
+      "handler": "cost-categories.find",
+      "config": {
+        "policies": []
+      }
+    },
+    {
+      "method": "GET",
+      "path": "/cost-categories/count",
+      "handler": "cost-categories.count",
+      "config": {
+        "policies": []
+      }
+    },
+    {
+      "method": "GET",
+      "path": "/cost-categories/:id",
+      "handler": "cost-categories.findOne",
+      "config": {
+        "policies": []
+      }
+    },
+    {
+      "method": "POST",
+      "path": "/cost-categories",
+      "handler": "cost-categories.create",
+      "config": {
+        "policies": []
+      }
+    },
+    {
+      "method": "PUT",
+      "path": "/cost-categories/:id",
+      "handler": "cost-categories.update",
+      "config": {
+        "policies": []
+      }
+    },
+    {
+      "method": "DELETE",
+      "path": "/cost-categories/:id",
+      "handler": "cost-categories.delete",
+      "config": {
+        "policies": []
+      }
+    }
+  ]
+}
diff --git a/api/cost-categories/controllers/cost-categories.js b/api/cost-categories/controllers/cost-categories.js
@@ -0,0 +1,8 @@
+'use strict';
+
+/**
+ * Read the documentation (https://strapi.io/documentation/v3.x/concepts/controllers.html#core-controllers)
+ * to customize this controller
+ */
+
+module.exports = {};
diff --git a/api/cost-categories/models/cost-categories.js b/api/cost-categories/models/cost-categories.js
@@ -0,0 +1,8 @@
+'use strict';
+
+/**
+ * Read the documentation (https://strapi.io/documentation/v3.x/concepts/models.html#lifecycle-hooks)
+ * to customize this model
+ */
+
+module.exports = {};