From 730e98a530daf2274fbb2aed4fec076fa1ade4b3 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Mon, 11 Jul 2016 11:40:13 -0400 Subject: [PATCH 1/4] Add new states. Change and fix state ids. --- .../services/project/project.service.ts | 113 +++++++++++------- 1 file changed, 72 insertions(+), 41 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index b1fe00a..9605dff 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -35,183 +35,214 @@ export class ProjectService { description: 'Schedule site visit with client and project engineer.', }, { - name: 'Perform Remote Assessment', + name: 'Complete Business Development PNS Section', id: 8, - description: 'Project Engineers perform remote assessment (Energy Watch, Code Violations, Google Earth, Heat Load Calculations).', + description: '', }, { - name: 'Conduct Site Visit', + name: 'Business Development PNS Section Approval', id: 9, - description: 'Project Engineer conducts site visit audit. All data entry is complete. Sensors are installed.', - }, + description: '', + }, /*Fix numbers*/ { - name: 'Complete Finance PNS', + name: 'Perform Remote Assessment', id: 10, - description: 'Complete Finance section of the PNS Form. This step does not have any dependencies. Must only be complete one month post site visit.', + description: 'Project Engineers perform remote assessment (Energy Watch, Code Violations, Google Earth, Heat Load Calculations).', }, { - name: 'Send PNS Form', + name: 'Complete Engineer PNS Section', id: 11, - description: 'Project Engineer sends client PNS Form.', + description: '', }, { - name: 'Perform Initial Engineering Analysis', + name: 'Engineer PNS Section Approval', id: 12, + description: '', + + }, /*Fix numbers*/ + { + name: 'Conduct Site Visit', + id: 13, + description: 'Project Engineer conducts site visit audit. All data entry is complete. Sensors are installed.', + }, + { + name: 'Perform Initial Engineering Analysis', + id: 14, description: 'Project Engineer performs energy efficiency calculations for annual savings.', }, { name: 'Send Diagnostic Report', - id: 13, + id: 15, description: 'Project Engineer creates diagnostic report.', }, + { + name: 'Complete Finance PNS Section', + id: 16, + description: 'Complete Finance section of the PNS Form. This step does not have any dependencies. Must only be complete one month post site visit.', + }, + { + name: 'Finance PNS Section Approval', + id: 17, + description: '', + },/*Fix numbersv*/ + { + name: 'Send PNS Form', + id: 18, + description: 'Project Engineer sends client PNS Form.', + }, { name: 'Follow Up Post Project Update', - id: 14, + id: 19, description: 'Project Engineer contacts client to discover if client is interested in moving forward.', }, { name: 'Outsource Retrofit', - id: 15, + id: 20, description: 'Project Manager assesses potential outsourced retrofits (e.g. lighting and windows).' }, { name: 'HPD Finance', - id: 16, + id: 21, description: 'Finance discovers if HPD will finance the project.', }, { name: 'Confirm Client wants HPD', - id: 17, + id: 22, description: 'Finance confirms client wants to proceed with HPD program.' }, { name: 'Preliminary Financial Analysis', - id: 18, + id: 23, description: 'Run preliminary financial model and suggest budget range for Project Engineer.', }, { name: 'Confirm Project Financing', - id: 19, + id: 24, description: 'Finance decides if project is feasible.', }, { name: 'Perform Detailed Calculations and Analysis', - id: 20, + id: 25, description: 'Project Engineer runs models (hydronic, steam, cooling, heating, controls).', }, { name: 'Write Scope of Work Report', - id: 21, + id: 26, description: 'Project Engineer selects desired equipment for retrofits.', }, { name: 'Obtain Quotes', - id: 22, + id: 27, description: 'Project Manager bundles nearby projects together and sends equipment lists to contractor to collect quotes and look for violations.', }, { name: 'Create Engineering Energy Output Model', - id: 23, + id: 28, description: 'Project Engineer generates Engineering Output Model for suggested scenario.', }, { name: 'Create Financial Model', - id: 24, + id: 29, description: 'Finance uses quotes and Engineering Output Model to run financial model for suggested scenario.', }, { name: 'Create Client Presentation', - id: 25, + id: 30, description: 'Project Engineer creates final presentation for various retrofit scenarios with upfront cost estimates and annual savings.', }, { name: 'Schedule Client Presentation', - id: 26, + id: 31, description: 'Project Manager coordinates with client, engineer, and finance/business to set up presentation date.', }, { name: 'Present to Client', - id: 27, + id: 32, description: 'Project Engineer presents retrofit scenarios and financing options to client.', }, { name: 'Client Chooses Retrofits', - id: 28, + id: 33, description: 'Project Engineer contacts Client to determine actionable retrofits. ', }, { name: 'Redesign Scope of Work', - id: 29, + id: 34, description: 'Project Engineer redesigns and finalizes scope of work.', }, + { + name: 'Send Client Scope of Work and List of Contractors', + id: 35, + description: '', + }, { name: 'Finalize Quotes', - id: 30, + id: 36, description: 'Project Engineer sends contractor Final Scope of Work and finalizes quotes. Contractor signs contract.', }, { name: 'Final Financial Model' , - id: 31, + id: 37, description: 'Finance runs the financial model to obtain actual costs including payback years.', }, { name: 'Update Client with Project Financing' , - id: 32 , + id: 38 , description: 'Finance contacts client to discuss financing options such as loans and marketplace.', }, { name: 'Client Decides on Marketplace' , - id: 33 , + id: 39 , description: 'Client decides if they want to use Marketplace.', }, { name: 'Marketplace Content' , - id: 34, + id: 40, description: 'The Project content gets collected to prepare it for a Marketplace Launch.', }, { name: 'Marketplace' , - id: 35, + id: 41, description: 'The Project is launched on the Marketplace and is being funded.', }, { name: 'Contractor Downpayment' , - id: 39, + id: 42, description: 'A downpayment is payed to contractor.', }, { name: 'Apply for Loan' , - id: 40, + id: 43, description: 'Finance appplies for loan.', }, { name: 'Approval of Underwriter' , - id: 41, + id: 44, description: 'Finance is notified that the loan was approved by the Underwriter (banks).', }, { name: 'Confirm Funding' , - id: 42, + id: 45, description: 'Finance confirms project is funded.', }, { name: 'Commence Construction' , - id: 43, + id: 46, description: 'Construction Manager coordinates with client contractor, and engineers to schedule retrofit construction.', }, { name: 'Measurement and Verification' , - id: 44, + id: 47, description: 'Project Engineer collects sensor data during site visit, recalibrates sensors, and reinstalls sensors for "post retrofit" measurement and verification.', }, { name: 'Loan Payback' , - id: 45, + id: 48, description: 'Loan is in the process of being paid back.', }, { name: 'Completed', - id: 46, + id: 49, description: 'Project is complete!' } ] -- GitLab From 7f27f1fedd70c6275c83a3b495b6fba4dc3c34aa Mon Sep 17 00:00:00 2001 From: calvinqh Date: Mon, 11 Jul 2016 11:40:41 -0400 Subject: [PATCH 2/4] Fix state_id for slots. --- .../components/project/slots.component.ts | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/front/current/components/project/slots.component.ts b/front/current/components/project/slots.component.ts index a52239e..8fb8ce6 100644 --- a/front/current/components/project/slots.component.ts +++ b/front/current/components/project/slots.component.ts @@ -18,16 +18,16 @@ export class SlotsComponent { slots:any[] = [ {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}, - {name: 'pictures', title: 'Pictures', state_id: 9}, - {name: 'sketches', title: 'Sketches', state_id: 9}, + {name: 'breakdown-of-bills', title: 'Breakdown of Bills', state_id: 10}, + {name: 'canvas', title: 'Canvas', state_id: 13}, + {name: 'pns', title: 'PNS Form', state_id: 14}, + {name: 'pictures', title: 'Pictures', state_id: 13}, + {name: 'sketches', title: 'Sketches', state_id: 13}, //Migration required to change name - {name: 'heat-load', title: 'Engineering Models', state_id: 8}, + {name: 'heat-load', title: 'Engineering Models', state_id: 10}, //Migration required to change name - {name: 'cooling-load', title: 'Engineering Models', state_id: 12}, - {name: 'diagnostic-report', title: 'Diagnostic Report', state_id: 13}, + {name: 'cooling-load', title: 'Engineering Models', state_id: 14}, + {name: 'diagnostic-report', title: 'Diagnostic Report', state_id: 15}, {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}, @@ -41,22 +41,22 @@ export class SlotsComponent { {name: 'proof-of-insurance', title: 'Proof of Property and Liability Insurance', state_id: 3}, {name: 'property-appraisal', title: 'Property Appraisal', state_id: 3}, {name: 'title-of-location', title: 'Title of Location', state_id: 3}, - {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: 'nyserda', title: 'NYSERDA Request for Financing Form', state_id: 43}, + {name: 'loan-application', title: 'Loan Application', state_id: 43}, + {name: 'contractor-quotes', title: 'Contractor Quotes', state_id: 36}, {name: 'misc', title: 'Miscellaneous', state_id: 3}, - {name: 'final-financial-model', title: 'Final Financial Model', state_id: 31}, - {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', 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}, - {name: 'marketplace-photos', title: 'Marketplace Photos', state_id: 9} + {name: 'final-financial-model', title: 'Final Financial Model', state_id: 37}, + {name: 'redesigned-scope-of-work', title: 'Redesigned Scope of Work', state_id: 34}, + {name: 'final-presentation', title: 'Final Presentation', state_id: 30}, + {name: 'financial-model', title: 'Financial Model', state_id: 29}, + {name: 'engineering-output-model', title: 'Engineering Output Model', state_id: 28}, + {name: 'quotes', title: 'Quotes', state_id: 27}, + {name: 'scope-of-work', title: 'Scope of Work', state_id: 26}, + {name: 'engineering-models', title: 'Engineering Models', state_id: 25}, + {name: 'financial-model', title: 'Financial Model', state_id: 23}, + {name: 'budget', title: 'Budget', state_id: 23}, + {name: 'signed-quotes', title: 'Quotes', state_id: 20}, + {name: 'marketplace-photos', title: 'Marketplace Photos', state_id: 13} ]; project:Model; document_slots:Collection; -- GitLab From 354f896658f96a4667419852fa0152219a99665b Mon Sep 17 00:00:00 2001 From: calvinqh Date: Mon, 11 Jul 2016 11:58:18 -0400 Subject: [PATCH 3/4] Add description to states. Remove the word section from some state titles. --- .../services/project/project.service.ts | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts index 9605dff..6c59cc0 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -35,31 +35,31 @@ export class ProjectService { description: 'Schedule site visit with client and project engineer.', }, { - name: 'Complete Business Development PNS Section', + name: 'Complete Business Development PNS', id: 8, - description: '', + description: 'Complete Business Develop section of PNS form', }, { - name: 'Business Development PNS Section Approval', + name: 'Business Development PNS Approval', id: 9, - description: '', - }, /*Fix numbers*/ + description: 'Business Development section of PNS form will go through approval.', + }, { name: 'Perform Remote Assessment', id: 10, description: 'Project Engineers perform remote assessment (Energy Watch, Code Violations, Google Earth, Heat Load Calculations).', }, { - name: 'Complete Engineer PNS Section', + name: 'Complete Engineer PNS', id: 11, - description: '', + description: 'Complete Engineer section of PNS Form.', }, { - name: 'Engineer PNS Section Approval', + name: 'Engineer PNS Approval', id: 12, - description: '', + description: 'Engineer section of the PNS form will go through approval.', - }, /*Fix numbers*/ + }, { name: 'Conduct Site Visit', id: 13, @@ -76,15 +76,15 @@ export class ProjectService { description: 'Project Engineer creates diagnostic report.', }, { - name: 'Complete Finance PNS Section', + name: 'Complete Finance PNS', id: 16, description: 'Complete Finance section of the PNS Form. This step does not have any dependencies. Must only be complete one month post site visit.', }, { - name: 'Finance PNS Section Approval', + name: 'Finance PNS Approval', id: 17, - description: '', - },/*Fix numbersv*/ + description: 'Finance section of the PNS form will go through approval.', + }, { name: 'Send PNS Form', id: 18, @@ -173,7 +173,7 @@ export class ProjectService { { name: 'Send Client Scope of Work and List of Contractors', id: 35, - description: '', + description: 'Client will be sent the scope of work and a list of contractors.', }, { name: 'Finalize Quotes', -- GitLab From 427e7bed09f424282a9e15a4e14f64361cc4be02 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Mon, 18 Jul 2016 13:31:28 -0400 Subject: [PATCH 4/4] Fixed spelling mistake. --- 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 6c59cc0..d915011 100644 --- a/front/current/services/project/project.service.ts +++ b/front/current/services/project/project.service.ts @@ -37,7 +37,7 @@ export class ProjectService { { name: 'Complete Business Development PNS', id: 8, - description: 'Complete Business Develop section of PNS form', + description: 'Complete Business Development section of PNS form', }, { name: 'Business Development PNS Approval', -- GitLab