From cdb40a86f7f17d431b5c29bf8abf1560622208c0 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Thu, 30 Jun 2016 16:34:41 -0400 Subject: [PATCH 01/10] Add new slots with their title and name but not their state_id. --- .../components/project/slots.component.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index 83c2278..19b2ed2 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -24,7 +24,7 @@ export class SlotsComponent { {name: 'pictures', title: 'Pictures', state_id: 9}, {name: 'sketches', title: 'Sketches', state_id: 9}, {name: 'heat-load', title: 'Heat Load', state_id: 8}, /* Also in state 12*/ - {name: 'cooling-load', title: 'Cooling Load', state_id: 12}, + {name: 'engineering-models_1', title: 'Engineering Models', state_id: 12}, {name: 'diagnostic-report', title: 'Diagnostic Report', state_id: 13}, {name: 'sceep-forms', title: 'SCEEP Forms', state_id: 3}, {name: 'pea-reports', title: 'PEA Reports', state_id: 3}, @@ -42,7 +42,19 @@ export class SlotsComponent { {name: 'nyserda', title: 'NYSERDA Request for Financing Form', state_id: 40}, {name: 'loan-application', title: 'Loan Application', state_id: 40}, {name: 'contractor-quotes', title: 'Contractor Quotes', state_id: 30}, - {name: 'misc', title: 'Miscellaneous', state_id: 3} + {name: 'misc', title: 'Miscellaneous', state_id: 3}, + {name: 'final-financial-model', title: 'Final Financial Model', state_id: }, + {name: 'redesigned-scope-of-work', title: 'Re-Designed Scope of Work', state_id: }, + {name: 'final-presentation', title: 'Final Presentation', state_id: }, + {name: 'financial-model', title: 'Financial Model', state_id: }, + {name: 'eng-output-model', title: 'Eng Output Model', state_id: }, + {name: 'quotes', title: 'Quotes', state_id: }, + {name: 'scope-of-work', title: 'Scope of Work', state_id: }, + {name: 'engineering-models_2', title: 'Engineering Models', state_id: }, + {name: 'finance-model', title: 'Finance Model', state_id: }, + {name: 'budget', title: 'Budget', state_id: }, + {name: 'signed-quotes', title: 'Quotes', state_id: }, + {name: 'marketplace-worthy-photos', title: 'Marketplace Worthy Photos', state_id: }, ]; project:Model; document_slots:Collection; -- GitLab From 0927c8908d57d48e5ce0358ce8d379f13787c2f0 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 1 Jul 2016 10:25:51 -0400 Subject: [PATCH 02/10] Add state_id to the new slots. --- .../components/project/slots.component.ts | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index 19b2ed2..81424e6 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -43,18 +43,18 @@ export class SlotsComponent { {name: 'loan-application', title: 'Loan Application', state_id: 40}, {name: 'contractor-quotes', title: 'Contractor Quotes', state_id: 30}, {name: 'misc', title: 'Miscellaneous', state_id: 3}, - {name: 'final-financial-model', title: 'Final Financial Model', state_id: }, - {name: 'redesigned-scope-of-work', title: 'Re-Designed Scope of Work', state_id: }, - {name: 'final-presentation', title: 'Final Presentation', state_id: }, - {name: 'financial-model', title: 'Financial Model', state_id: }, - {name: 'eng-output-model', title: 'Eng Output Model', state_id: }, - {name: 'quotes', title: 'Quotes', state_id: }, - {name: 'scope-of-work', title: 'Scope of Work', state_id: }, - {name: 'engineering-models_2', title: 'Engineering Models', state_id: }, - {name: 'finance-model', title: 'Finance Model', state_id: }, - {name: 'budget', title: 'Budget', state_id: }, - {name: 'signed-quotes', title: 'Quotes', state_id: }, - {name: 'marketplace-worthy-photos', title: 'Marketplace Worthy Photos', state_id: }, + {name: 'final-financial-model', title: 'Final Financial Model', state_id: 31}, + {name: 'redesigned-scope-of-work', title: 'Re-Designed Scope of Work', state_id: 29}, + {name: 'final-presentation', title: 'Final Presentation', state_id: 25}, + {name: 'financial-model', title: 'Financial Model', state_id: 24}, + {name: 'eng-output-model', title: 'Eng Output Model', state_id: 23}, + {name: 'quotes', title: 'Quotes', state_id: 22}, + {name: 'scope-of-work', title: 'Scope of Work', state_id: 21}, + {name: 'engineering-models_2', title: 'Engineering Models', state_id: 20}, + {name: 'finance-model', title: 'Finance Model', state_id: 18}, + {name: 'budget', title: 'Budget', state_id: 18}, + {name: 'signed-quotes', title: 'Quotes', state_id: 15}, + {name: 'marketplace-worthy-photos', title: 'Marketplace Worthy Photos', state_id: 9}, ]; project:Model; document_slots:Collection; -- GitLab From 94800ea38ca9e7dccadfb8d406a16c1b6c591823 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 1 Jul 2016 10:43:49 -0400 Subject: [PATCH 03/10] Change state_id for PNS. --- front/current/components/project/slots.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index 81424e6..6383981 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -20,7 +20,7 @@ export class SlotsComponent { {name: 'utility-bills', title: 'Utility Bills', state_id: 3}, {name: 'breakdown-of-bills', title: 'Breakdown of Bills', state_id: 8}, {name: 'canvas', title: 'Canvas', state_id: 9}, - {name: 'pns', title: 'PNS Form', state_id: 4}, /*Contains multiple PNS Forms for each department, 10, 11*/ + {name: 'pns', title: 'PNS Form', state_id: 12}, /*Contains multiple PNS Forms for each department, 10, 11*/ {name: 'pictures', title: 'Pictures', state_id: 9}, {name: 'sketches', title: 'Sketches', state_id: 9}, {name: 'heat-load', title: 'Heat Load', state_id: 8}, /* Also in state 12*/ @@ -47,7 +47,7 @@ export class SlotsComponent { {name: 'redesigned-scope-of-work', title: 'Re-Designed Scope of Work', state_id: 29}, {name: 'final-presentation', title: 'Final Presentation', state_id: 25}, {name: 'financial-model', title: 'Financial Model', state_id: 24}, - {name: 'eng-output-model', title: 'Eng Output Model', state_id: 23}, + {name: 'engineering-output-model', title: 'Engineering Output Model', state_id: 23}, {name: 'quotes', title: 'Quotes', state_id: 22}, {name: 'scope-of-work', title: 'Scope of Work', state_id: 21}, {name: 'engineering-models_2', title: 'Engineering Models', state_id: 20}, -- GitLab From 66f3ac3747ca6cc84375f4ca476bb94b9371fcac Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 1 Jul 2016 11:05:35 -0400 Subject: [PATCH 04/10] Remove trailing comma. --- front/current/components/project/slots.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index 6383981..a02950d 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -54,7 +54,7 @@ export class SlotsComponent { {name: 'finance-model', title: 'Finance Model', state_id: 18}, {name: 'budget', title: 'Budget', state_id: 18}, {name: 'signed-quotes', title: 'Quotes', state_id: 15}, - {name: 'marketplace-worthy-photos', title: 'Marketplace Worthy Photos', state_id: 9}, + {name: 'marketplace-worthy-photos', title: 'Marketplace Worthy Photos', state_id: 9} ]; project:Model; document_slots:Collection; -- GitLab From ec58df549b2bb2714fdde25d1d9adb19b437420b Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 1 Jul 2016 11:29:06 -0400 Subject: [PATCH 05/10] Remove comments. --- front/current/components/project/slots.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index a02950d..2ee15f8 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -20,17 +20,17 @@ export class SlotsComponent { {name: 'utility-bills', title: 'Utility Bills', state_id: 3}, {name: 'breakdown-of-bills', title: 'Breakdown of Bills', state_id: 8}, {name: 'canvas', title: 'Canvas', state_id: 9}, - {name: 'pns', title: 'PNS Form', state_id: 12}, /*Contains multiple PNS Forms for each department, 10, 11*/ + {name: 'pns', title: 'PNS Form', state_id: 12}, {name: 'pictures', title: 'Pictures', state_id: 9}, {name: 'sketches', title: 'Sketches', state_id: 9}, - {name: 'heat-load', title: 'Heat Load', state_id: 8}, /* Also in state 12*/ + {name: 'heat-load', title: 'Heat Load', state_id: 8}, {name: 'engineering-models_1', title: 'Engineering Models', state_id: 12}, {name: 'diagnostic-report', title: 'Diagnostic Report', state_id: 13}, {name: 'sceep-forms', title: 'SCEEP Forms', state_id: 3}, {name: 'pea-reports', title: 'PEA Reports', state_id: 3}, {name: 'balance-sheets', title: 'Balance Sheets', state_id: 6}, {name: 'income-statements', title: 'Income Statements', state_id: 3}, - {name: 'financial-reports', title: 'Financial Reports', state_id: 6}, /*Is it 4 or 6*/ + {name: 'financial-reports', title: 'Financial Reports', state_id: 6}, {name: 'taxes', title: 'Taxes', state_id: 3}, {name: 'credit-reports', title: 'Credit Reports', state_id: 3}, {name: 'certificate-of-incorporation', title: 'Certificate of Incorporation', state_id: 3}, -- GitLab From 2df813598250214068d09215baaeeeba6ad6fdd7 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 1 Jul 2016 13:43:33 -0400 Subject: [PATCH 06/10] Fix wording and grammar. --- front/current/components/project/slots.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index 2ee15f8..f8ea668 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -44,17 +44,17 @@ export class SlotsComponent { {name: 'contractor-quotes', title: 'Contractor Quotes', state_id: 30}, {name: 'misc', title: 'Miscellaneous', state_id: 3}, {name: 'final-financial-model', title: 'Final Financial Model', state_id: 31}, - {name: 'redesigned-scope-of-work', title: 'Re-Designed Scope of Work', state_id: 29}, + {name: 'redesigned-scope-of-work', title: 'Redesigned Scope of Work', state_id: 29}, {name: 'final-presentation', title: 'Final Presentation', state_id: 25}, {name: 'financial-model', title: 'Financial Model', state_id: 24}, {name: 'engineering-output-model', title: 'Engineering Output Model', state_id: 23}, {name: 'quotes', title: 'Quotes', state_id: 22}, {name: 'scope-of-work', title: 'Scope of Work', state_id: 21}, {name: 'engineering-models_2', title: 'Engineering Models', state_id: 20}, - {name: 'finance-model', title: 'Finance Model', state_id: 18}, + {name: 'financial-model', title: 'Financial Model', state_id: 18}, {name: 'budget', title: 'Budget', state_id: 18}, {name: 'signed-quotes', title: 'Quotes', state_id: 15}, - {name: 'marketplace-worthy-photos', title: 'Marketplace Worthy Photos', state_id: 9} + {name: 'marketplace-photos', title: 'Marketplace Photos', state_id: 9} ]; project:Model; document_slots:Collection; -- GitLab From 7b2de7e2b03e70b037ed4619b68e9a5a892d6718 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 1 Jul 2016 14:23:34 -0400 Subject: [PATCH 07/10] Change finance model to financial model. Fix spelling mistake. --- front/current/services/project/project.service.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index 3ade946..85c9976 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -87,7 +87,7 @@ export class ProjectService { { name: 'Preliminary Financial Analysis', id: 18, - description: 'Run preliminary finance model and suggest budget range for Project Engineer.', + description: 'Run preliminary financial model and suggest budget range for Project Engineer.', }, { name: 'Confirm Project Financing', @@ -115,7 +115,7 @@ export class ProjectService { description: 'Project Engineer generates Engineering Output Model for suggested scenario.', }, { - name: 'Create Finance Model', + name: 'Create Financial Model', id: 24, description: 'Finance uses quotes and Engineering Output Model to run Finance model for suggested scenario.', }, @@ -150,9 +150,9 @@ export class ProjectService { description: 'Project Engineer sends contractor Final Scope of Work and finalizes quotes. Contractor signs contract.', }, { - name: 'Final Finance Model' , + name: 'Final Financial Model' , id: 31, - description: 'Finance runs the finance model to obtain actual costs inclduing payback years.', + description: 'Finance runs the financial model to obtain actual costs including payback years.', }, { name: 'Update Client with Project Financing' , -- GitLab From 6242e955283edb1fc723eca060b2cddaa9f3e06a Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 1 Jul 2016 14:28:40 -0400 Subject: [PATCH 08/10] Change Finance model to financial model. --- front/current/services/project/project.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index 85c9976..b1fe00a 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -117,7 +117,7 @@ export class ProjectService { { name: 'Create Financial Model', id: 24, - description: 'Finance uses quotes and Engineering Output Model to run Finance model for suggested scenario.', + description: 'Finance uses quotes and Engineering Output Model to run financial model for suggested scenario.', }, { name: 'Create Client Presentation', -- GitLab From e0e82251f21a709ecd50593583d260c83b66d250 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 5 Jul 2016 16:53:07 -0400 Subject: [PATCH 09/10] Revert name change of engineering-models_1 to cooling-load. Change title of heating-load to Engineering Models. --- front/current/components/project/slots.component.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index f8ea668..6c93a68 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -23,8 +23,10 @@ export class SlotsComponent { {name: 'pns', title: 'PNS Form', state_id: 12}, {name: 'pictures', title: 'Pictures', state_id: 9}, {name: 'sketches', title: 'Sketches', state_id: 9}, - {name: 'heat-load', title: 'Heat Load', state_id: 8}, - {name: 'engineering-models_1', title: 'Engineering Models', state_id: 12}, + //Migration required to change name + {name: 'heat-load', title: 'Engineering Models', state_id: 8}, + //Migration required to change name + {name: 'cooling-load', title: 'Engineering Models', state_id: 12}, {name: 'diagnostic-report', title: 'Diagnostic Report', state_id: 13}, {name: 'sceep-forms', title: 'SCEEP Forms', state_id: 3}, {name: 'pea-reports', title: 'PEA Reports', state_id: 3}, -- GitLab From bf7e8de52f37454fc16dfee1ba75c7b9a69e50c5 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 5 Jul 2016 16:56:34 -0400 Subject: [PATCH 10/10] Remove _2 from engineering-models name. --- front/current/components/project/slots.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index 6c93a68..a52239e 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -52,7 +52,7 @@ export class SlotsComponent { {name: 'engineering-output-model', title: 'Engineering Output Model', state_id: 23}, {name: 'quotes', title: 'Quotes', state_id: 22}, {name: 'scope-of-work', title: 'Scope of Work', state_id: 21}, - {name: 'engineering-models_2', title: 'Engineering Models', state_id: 20}, + {name: 'engineering-models', title: 'Engineering Models', state_id: 20}, {name: 'financial-model', title: 'Financial Model', state_id: 18}, {name: 'budget', title: 'Budget', state_id: 18}, {name: 'signed-quotes', title: 'Quotes', state_id: 15}, -- GitLab