From 7696d9e01a53564d0ad4a775a2d86dd06e365380 Mon Sep 17 00:00:00 2001 From: Nick Doiron Date: Mon, 27 Feb 2017 10:24:16 -0500 Subject: [PATCH 01/14] rename package for Yemen --- README.md | 2 +- app/assets/scripts/components/Header.js | 2 +- package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d7310a9..48602b1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# IFPRI Egypt Data Entry +# IFPRI Yemen Data Entry Data Entry form for IFPRI backend. Authentication handled with Auth0. diff --git a/app/assets/scripts/components/Header.js b/app/assets/scripts/components/Header.js index fe5090c..6f1cb35 100644 --- a/app/assets/scripts/components/Header.js +++ b/app/assets/scripts/components/Header.js @@ -10,7 +10,7 @@ class Header extends React.Component {
From 94d2622709299ae2c32f101a531d739a7c42273a Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 14 Mar 2017 10:04:57 -0400 Subject: [PATCH 09/14] Update the sub-sector categories --- app/assets/scripts/components/ProjectForm.js | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/assets/scripts/components/ProjectForm.js b/app/assets/scripts/components/ProjectForm.js index a4d2b56..044b146 100644 --- a/app/assets/scripts/components/ProjectForm.js +++ b/app/assets/scripts/components/ProjectForm.js @@ -646,20 +646,20 @@ class ProjectForm extends React.Component { 'Sub-sector - القطاع الفرعي', 'Select a sub-sector - يُرحى اختيار قطاع فرعي', [ - 'Agriculture Extension & Research', - 'Agro-industry, Marketing & Trade', - 'Crops', - 'Fishing, Aquaculture & Forestry', - 'Livestock', - 'Rural Infrastructure & Irrigation' + 'Agriculture', + 'Water', + 'Trade & Employment', + 'Health', + 'Nutrition', + 'Education' ], [ - 'الارشاد الزراعي والبحث', - 'الصناعات الزراعية والتسويق والتجارة', - 'المحاصيل', - 'صيد الأسماك و الزراعة المائية وعلم التحريج', - 'الثروة الحيوانية', - 'البنية التحتية بالمناطق الريفية والري' + 'الزراعة', + 'المياه', + 'التجارة و التوظيف', + 'الصحة', + 'التغذية', + 'التعليم' ], true ), From 0d6af2da95f811f70564cfb9b583f40429f77959 Mon Sep 17 00:00:00 2001 From: Marc Farra Date: Thu, 16 Nov 2017 16:17:21 -0500 Subject: [PATCH 10/14] Hotfixes * remove sds indicator requirements (#5) * add check for admin in role --- app/assets/scripts/components/ProjectForm.js | 1 - app/assets/scripts/utils/AuthService.js | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/assets/scripts/components/ProjectForm.js b/app/assets/scripts/components/ProjectForm.js index 442a2d0..a353522 100644 --- a/app/assets/scripts/components/ProjectForm.js +++ b/app/assets/scripts/components/ProjectForm.js @@ -23,7 +23,6 @@ export const schema = { 'planned_start_date', 'published', 'sdg_indicator', - 'sds_indicator', 'status' ], properties: { diff --git a/app/assets/scripts/utils/AuthService.js b/app/assets/scripts/utils/AuthService.js index 5e11966..d54f0c4 100644 --- a/app/assets/scripts/utils/AuthService.js +++ b/app/assets/scripts/utils/AuthService.js @@ -45,12 +45,16 @@ export default class AuthService { loggedIn () { const token = this.getToken(); - return !!token && !isTokenExpired(token) && isEditor(token); + return !!token && !isTokenExpired(token) && this.allowedAccess(token); } loggedInNotEditor () { const token = this.getToken(); - return !!token && !isTokenExpired(token) && !(isEditor(token) || isAdmin(token)); + return !!token && !isTokenExpired(token) && !this.allowedAccess(token); + } + + allowedAccess (token) { + return isEditor(token) || isAdmin(token); } isAdmin () { From 5e6f9232ed02fc53526ea2a2720f9afd9276800b Mon Sep 17 00:00:00 2001 From: Marc Farra Date: Thu, 16 Nov 2017 23:25:33 -0500 Subject: [PATCH 11/14] hotfix: hide SDS goals --- app/assets/scripts/components/ProjectForm.js | 34 ++++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/app/assets/scripts/components/ProjectForm.js b/app/assets/scripts/components/ProjectForm.js index a353522..ba01853 100644 --- a/app/assets/scripts/components/ProjectForm.js +++ b/app/assets/scripts/components/ProjectForm.js @@ -106,16 +106,16 @@ export const schema = { number_served_unit_ar: {type: 'string', title: 'الفئة', 'description': 'مثال: الاسر المستفيدة'} } }, - sds_indicator: { - title: 'SDS Goals - أهداف استراتيجية التنمية المُستدامة', - type: 'array', - items: { - title: 'SDS Goal - هدف استراتيجية التنمية المُستدامة', - type: 'object', - required: ['en'], - properties: {en: {type: 'string', title: 'SDS Indicator'}, ar: {type: 'string'}} - } - }, + // sds_indicator: { + // title: 'SDS Goals - أهداف استراتيجية التنمية المُستدامة', + // type: 'array', + // items: { + // title: 'SDS Goal - هدف استراتيجية التنمية المُستدامة', + // type: 'object', + // required: ['en'], + // properties: {en: {type: 'string', title: 'SDS Indicator'}, ar: {type: 'string'}} + // } + // }, sdg_indicator: { title: 'SDG Goals - أهداف التنمية المستدامة', type: 'array', @@ -631,13 +631,13 @@ class ProjectForm extends React.Component { 'الهيئة العامة لتنمية الثروة السمكية' ] ), - 'select-sds_indicator': Dropdown( - 'SDS Goal - هدف استراتيجية التنمية المُستدامة', - sdsLabels.select, - sdsLabels.en, - sdsLabels.ar, - true - ), + // 'select-sds_indicator': Dropdown( + // 'SDS Goal - هدف استراتيجية التنمية المُستدامة', + // sdsLabels.select, + // sdsLabels.en, + // sdsLabels.ar, + // true + // ), 'select-sdg_indicator': Dropdown( 'SDG Goal - هدف التنمية المستدامة', sdgLabels.select, From 6b010a627d3a8c6555b087a99a4b358baba0c73d Mon Sep 17 00:00:00 2001 From: Ali Felski Date: Wed, 22 Nov 2017 17:00:40 -0500 Subject: [PATCH 12/14] adding new status --- app/assets/scripts/components/ProjectForm.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/scripts/components/ProjectForm.js b/app/assets/scripts/components/ProjectForm.js index ba01853..36d839a 100644 --- a/app/assets/scripts/components/ProjectForm.js +++ b/app/assets/scripts/components/ProjectForm.js @@ -605,12 +605,14 @@ class ProjectForm extends React.Component { [ 'Planned', 'Ongoing', - 'Closed' + 'Closed', + 'Suspended/Halted' ], [ 'مُخطط', 'جاري/ مستمر', - 'مُغلق' + 'مُغلق', + 'معلق' ] ), 'select-ministry': Dropdown('Responsible Ministry - الوزارة المسؤولة', 'Select a Ministry', From 04230326f1559b9eb75d5583b18755c692fbcfd0 Mon Sep 17 00:00:00 2001 From: Ali Felski Date: Wed, 22 Nov 2017 17:12:34 -0500 Subject: [PATCH 13/14] fixed lint error --- app/assets/scripts/components/ProjectForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/scripts/components/ProjectForm.js b/app/assets/scripts/components/ProjectForm.js index 36d839a..34325d0 100644 --- a/app/assets/scripts/components/ProjectForm.js +++ b/app/assets/scripts/components/ProjectForm.js @@ -8,7 +8,7 @@ import CustomTextWidget from './widgets/CustomTextWidget'; import CustomNumberWidget from './widgets/CustomNumberWidget'; import Dropdown from './widgets/Dropdown'; import {setMaybe, transformErrors} from '../utils/nullUtils'; -import {sdsLabels, sdgLabels} from '../utils/labels'; +import {sdgLabels} from '../utils/labels'; export const schema = { type: 'object', From 28789d0a4dd37f0d8f9723facc6cdc9f6c5da365 Mon Sep 17 00:00:00 2001 From: Ali Felski Date: Mon, 4 Dec 2017 17:33:31 -0500 Subject: [PATCH 14/14] fixed list of ministries and also subsectors --- app/assets/scripts/components/ProjectForm.js | 64 ++++++++++++++------ 1 file changed, 44 insertions(+), 20 deletions(-) diff --git a/app/assets/scripts/components/ProjectForm.js b/app/assets/scripts/components/ProjectForm.js index 34325d0..fefafc8 100644 --- a/app/assets/scripts/components/ProjectForm.js +++ b/app/assets/scripts/components/ProjectForm.js @@ -617,20 +617,36 @@ class ProjectForm extends React.Component { ), 'select-ministry': Dropdown('Responsible Ministry - الوزارة المسؤولة', 'Select a Ministry', [ - 'Ministry of Agriculture and Land Reclamation', - 'Ministry of International Cooperation and Investment', - 'Ministry of Environment – Egyptian Environment Affairs Agency', - 'Ministry of Water Resources and Irrigation', - 'Ministry of Trade and Industry', - 'General Authority For Fish Resources Development' + 'Ministry of Planning and International Cooperation', + 'Ministry of Agriculture and Irrigation', + 'Ministry of Water and Environment', + 'Ministry of Local Administration', + 'Ministry of Social Affairs and Labor', + 'Ministry of Oil and Minerals', + 'Ministry of Education', + 'Ministry of Technical Education and Vocational Training', + 'Ministry of Finance', + 'Ministry of Electricity and Energy', + 'Ministry of Public Health and Population', + 'Ministry of Higher Education and Scientific Research', + 'Ministry of Fish Wealth', + 'Ministry of Industry and Trade' ], [ - 'وزارة الزراعة واستصلاح الأراضي', - 'وزارة الاستثمار و التعاون الدولى', - 'وزارة البيئة - جهاز شئون البيئة', - 'وزارة الموارد المائية والراي', - 'وزارة التجارة والصناعة', - 'الهيئة العامة لتنمية الثروة السمكية' + 'وزارة التخطيط والتعاون الدولي', + 'وزارة الزراعة والري', + 'وزارة المياه والبيئة', + 'وزارة الإدارة المحلية', + 'وزارة الشؤون الإجتماعية والعمل', + 'وزارة النفط والمعادن', + 'وزارة التربية والتعليم', + 'وزارة التعليم الفني والتدريب المهني', + 'وزارة المالية', + 'وزارة الكهرباء والطاقة', + 'وزارة الصحة العامة والسكان', + 'وزارة التعليم العالي والبحث العلمي', + 'وزارة الثروة السمكية', + 'وزارة الصناعة والتجارة' ] ), // 'select-sds_indicator': Dropdown( @@ -651,20 +667,28 @@ class ProjectForm extends React.Component { 'Sub-sector - القطاع الفرعي', 'Select a sub-sector - يُرحى اختيار قطاع فرعي', [ - 'Agriculture', - 'Water', - 'Trade & Employment', + 'Agriculture and food security', 'Health', 'Nutrition', - 'Education' + 'Education', + 'Rural Infrastructure and Irrigation', + 'Crops', + 'Livestock', + 'Agroindustry Marketing and Trade', + 'Fisheries', + 'Environment' ], [ - 'الزراعة', - 'المياه', - 'التجارة و التوظيف', + 'الزراعة والأمن الغذائي', 'الصحة', 'التغذية', - 'التعليم' + 'التعليم', + 'لبنية التحتية الريفية والري', + 'المحاصيل', + 'تربية الماشية', + 'تسويق الصناعات الزراعية والتجارة', + 'مصايد الأسماك', + 'البيئة' ], true ),