From 02b623d27355827c36bb838d7ca1f1630cdecb66 Mon Sep 17 00:00:00 2001 From: Conrad Date: Mon, 5 Feb 2018 14:15:08 -0500 Subject: [PATCH 1/4] Set timeout to 120 seconds on salesforce jobs --- pentaho/salesforce/SalesforceETL/account.ktr | 4 +- .../SalesforceETL/account_contact.ktr | 6 +- .../SalesforceETL/account_history.ktr | 80 +++++++------- pentaho/salesforce/SalesforceETL/contact.ktr | 6 +- pentaho/salesforce/SalesforceETL/lead.ktr | 80 +++++++------- .../salesforce/SalesforceETL/master_job.kjb | 102 +----------------- .../salesforce/SalesforceETL/opportunity.ktr | 80 +++++++------- .../SalesforceETL/opportunity_history.ktr | 82 +++++++------- .../SalesforceETL/project_location.ktr | 80 +++++++------- 9 files changed, 211 insertions(+), 309 deletions(-) diff --git a/pentaho/salesforce/SalesforceETL/account.ktr b/pentaho/salesforce/SalesforceETL/account.ktr index 390f16c..78ba934 100644 --- a/pentaho/salesforce/SalesforceETL/account.ktr +++ b/pentaho/salesforce/SalesforceETL/account.ktr @@ -429,7 +429,7 @@ - 2017/11/27 16:00:41.942 - - 2017/11/28 12:55:20.873 + 2018/02/05 14:05:14.418 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -512,7 +512,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 60000 + 120 N Account diff --git a/pentaho/salesforce/SalesforceETL/account_contact.ktr b/pentaho/salesforce/SalesforceETL/account_contact.ktr index 97f183a..a245f71 100644 --- a/pentaho/salesforce/SalesforceETL/account_contact.ktr +++ b/pentaho/salesforce/SalesforceETL/account_contact.ktr @@ -429,8 +429,8 @@ - 2017/11/28 16:22:20.522 - - 2017/11/28 16:24:03.964 - + 2018/02/05 14:06:02.996 + H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -512,7 +512,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 60000 + 120 N BlocPower_Account_Contact__c diff --git a/pentaho/salesforce/SalesforceETL/account_history.ktr b/pentaho/salesforce/SalesforceETL/account_history.ktr index efa307a..6775c3e 100644 --- a/pentaho/salesforce/SalesforceETL/account_history.ktr +++ b/pentaho/salesforce/SalesforceETL/account_history.ktr @@ -429,8 +429,8 @@ - 2017/11/28 16:18:41.510 - - 2017/11/28 16:20:31.190 - + 2018/02/05 14:13:40.349 + H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -512,7 +512,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 60000 + 120 N AccountHistory @@ -662,6 +662,43 @@ Y + + Execute SQL script + ExecSQL + + Y + + 1 + + none + + + customer_db + N + N + N + N + truncate table salesforce_db.sf_account_history; + N + + + + + + + + + + + + + + + 272 + 144 + Y + + account history output TableOutput @@ -737,43 +774,6 @@ Y - - Execute SQL script - ExecSQL - - Y - - 1 - - none - - - customer_db - N - N - N - N - truncate table salesforce_db.sf_account_history; - N - - - - - - - - - - - - - - - 272 - 144 - Y - - diff --git a/pentaho/salesforce/SalesforceETL/contact.ktr b/pentaho/salesforce/SalesforceETL/contact.ktr index bacc27f..30ff9e4 100644 --- a/pentaho/salesforce/SalesforceETL/contact.ktr +++ b/pentaho/salesforce/SalesforceETL/contact.ktr @@ -429,8 +429,8 @@ - 2017/11/28 12:56:29.933 - - 2017/11/28 17:16:11.093 - + 2018/02/05 14:04:51.009 + H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -512,7 +512,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 60000 + 120 N Contact diff --git a/pentaho/salesforce/SalesforceETL/lead.ktr b/pentaho/salesforce/SalesforceETL/lead.ktr index ecd9452..7ccf579 100644 --- a/pentaho/salesforce/SalesforceETL/lead.ktr +++ b/pentaho/salesforce/SalesforceETL/lead.ktr @@ -429,8 +429,8 @@ - 2017/11/28 13:35:36.579 - - 2017/11/28 17:15:49.670 - + 2018/02/05 14:04:34.919 + H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -498,6 +498,43 @@ Y + + Execute SQL script + ExecSQL + + Y + + 1 + + none + + + customer_db + N + N + N + N + truncate table salesforce_db.sf_lead; + N + + + + + + + + + + + + + + + 176 + 176 + Y + + Lead Salesforce Input SalesforceInput @@ -512,7 +549,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 60000 + 120 N Lead @@ -2141,43 +2178,6 @@ Y - - Execute SQL script - ExecSQL - - Y - - 1 - - none - - - customer_db - N - N - N - N - truncate table salesforce_db.sf_lead; - N - - - - - - - - - - - - - - - 176 - 176 - Y - - diff --git a/pentaho/salesforce/SalesforceETL/master_job.kjb b/pentaho/salesforce/SalesforceETL/master_job.kjb index 5094702..41e462b 100644 --- a/pentaho/salesforce/SalesforceETL/master_job.kjb +++ b/pentaho/salesforce/SalesforceETL/master_job.kjb @@ -8,7 +8,7 @@ - 2017/11/27 15:58:57.677 - - 2017/11/28 17:56:29.286 + 2018/02/05 14:13:42.028 @@ -348,7 +348,7 @@ WRITE_TO_LOG There was an error. Restoring to database. - + Basic N Y @@ -450,77 +450,6 @@ PGPASSWORD="${DB_password}" \ 704 352 - - DUMMY - - SPECIAL - N - Y - N - 0 - 0 - 60 - 12 - 0 - 1 - 1 - N - Y - 0 - 832 - 576 - - - Wait for SQL - - WAIT_FOR_SQL - - - - rows_count_greater - 0 - N - N - - N - 0 - 60 - N - Y - N - Y - 0 - 1032 - 576 - - - Wait for - - DELAY - - 0 - N - Y - 0 - 1232 - 576 - - - Wait for file - - WAIT_FOR_FILE - - 0 - 60 - N - N - N - N - Y - 0 - 1432 - 576 - Abort job @@ -821,33 +750,6 @@ PGPASSWORD="${DB_password}" \ N Y - - DUMMY - Wait for SQL - 0 - 0 - Y - Y - N - - - Wait for SQL - Wait for - 0 - 0 - Y - Y - N - - - Wait for - Wait for file - 0 - 0 - Y - Y - N - START Backup database diff --git a/pentaho/salesforce/SalesforceETL/opportunity.ktr b/pentaho/salesforce/SalesforceETL/opportunity.ktr index 3d20d3f..7c72e49 100644 --- a/pentaho/salesforce/SalesforceETL/opportunity.ktr +++ b/pentaho/salesforce/SalesforceETL/opportunity.ktr @@ -429,8 +429,8 @@ - 2017/11/28 13:45:24.325 - - 2017/11/28 17:15:25.240 - + 2018/02/05 14:04:19.168 + H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -498,6 +498,43 @@ Y + + Execute SQL script + ExecSQL + + Y + + 1 + + none + + + customer_db + N + N + N + N + truncate table salesforce_db.sf_opportunity; + N + + + + + + + + + + + + + + + 112 + 288 + Y + + Opportunity Salesforce Input SalesforceInput @@ -512,7 +549,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 60000 + 60 N Opportunity @@ -1277,43 +1314,6 @@ Y - - Execute SQL script - ExecSQL - - Y - - 1 - - none - - - customer_db - N - N - N - N - truncate table salesforce_db.sf_opportunity; - N - - - - - - - - - - - - - - - 112 - 288 - Y - - diff --git a/pentaho/salesforce/SalesforceETL/opportunity_history.ktr b/pentaho/salesforce/SalesforceETL/opportunity_history.ktr index 48cff33..4d36979 100644 --- a/pentaho/salesforce/SalesforceETL/opportunity_history.ktr +++ b/pentaho/salesforce/SalesforceETL/opportunity_history.ktr @@ -429,8 +429,8 @@ - 2017/11/28 16:24:11.196 - - 2017/11/28 17:12:39.307 - + 2018/02/05 14:05:32.914 + H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -498,6 +498,43 @@ Y + + Execute SQL script + ExecSQL + + Y + + 1 + + none + + + customer_db + N + N + N + N + truncate table salesforce_db.sf_opportunity_history; + N + + + + + + + + + + + + + + + 432 + 240 + Y + + Opportunity History Salesforce Input SalesforceInput @@ -512,7 +549,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 60000 + 120 N OpportunityHistory @@ -735,7 +772,7 @@ 1000 Y N - Y + N Y N @@ -809,43 +846,6 @@ Y - - Execute SQL script - ExecSQL - - Y - - 1 - - none - - - customer_db - N - N - N - N - truncate table salesforce_db.sf_opportunity_history; - N - - - - - - - - - - - - - - - 432 - 240 - Y - - diff --git a/pentaho/salesforce/SalesforceETL/project_location.ktr b/pentaho/salesforce/SalesforceETL/project_location.ktr index 4cab7b2..f8b4e23 100644 --- a/pentaho/salesforce/SalesforceETL/project_location.ktr +++ b/pentaho/salesforce/SalesforceETL/project_location.ktr @@ -429,8 +429,8 @@ - 2017/11/28 16:20:53.550 - - 2017/11/28 17:23:41.587 - + 2018/02/05 14:05:47.643 + H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -498,6 +498,43 @@ Y + + Execute SQL script + ExecSQL + + Y + + 1 + + none + + + customer_db + N + N + N + N + truncate table salesforce_db.sf_project_location; + N + + + + + + + + + + + + + + + 384 + 176 + Y + + Project Location Salesforce Input SalesforceInput @@ -512,7 +549,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 60000 + 120 N ProjectLocation__c @@ -1745,43 +1782,6 @@ Y - - Execute SQL script - ExecSQL - - Y - - 1 - - none - - - customer_db - N - N - N - N - truncate table salesforce_db.sf_project_location; - N - - - - - - - - - - - - - - - 384 - 176 - Y - - -- GitLab From 4f945ae709d0dfbf7df9de2bf45fc5a3c51f69a9 Mon Sep 17 00:00:00 2001 From: Conrad Date: Mon, 5 Feb 2018 16:13:30 -0500 Subject: [PATCH 2/4] New opportunity fields --- pentaho/salesforce/SalesforceETL/account.ktr | 4 +- .../SalesforceETL/account_contact.ktr | 4 +- .../SalesforceETL/account_history.ktr | 4 +- pentaho/salesforce/SalesforceETL/contact.ktr | 4 +- pentaho/salesforce/SalesforceETL/lead.ktr | 4 +- .../salesforce/SalesforceETL/master_job.kjb | 2 +- .../salesforce/SalesforceETL/opportunity.ktr | 60 ++++++++++++++++++- .../SalesforceETL/opportunity_history.ktr | 4 +- .../SalesforceETL/project_location.ktr | 4 +- 9 files changed, 72 insertions(+), 18 deletions(-) diff --git a/pentaho/salesforce/SalesforceETL/account.ktr b/pentaho/salesforce/SalesforceETL/account.ktr index 78ba934..b04ecd0 100644 --- a/pentaho/salesforce/SalesforceETL/account.ktr +++ b/pentaho/salesforce/SalesforceETL/account.ktr @@ -429,7 +429,7 @@ - 2017/11/27 16:00:41.942 - - 2018/02/05 14:05:14.418 + 2018/02/05 16:06:28.638 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -512,7 +512,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 120 + 60000 N Account diff --git a/pentaho/salesforce/SalesforceETL/account_contact.ktr b/pentaho/salesforce/SalesforceETL/account_contact.ktr index a245f71..bd6186f 100644 --- a/pentaho/salesforce/SalesforceETL/account_contact.ktr +++ b/pentaho/salesforce/SalesforceETL/account_contact.ktr @@ -429,7 +429,7 @@ - 2017/11/28 16:22:20.522 - - 2018/02/05 14:06:02.996 + 2018/02/05 16:07:00.113 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -512,7 +512,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 120 + 60000 N BlocPower_Account_Contact__c diff --git a/pentaho/salesforce/SalesforceETL/account_history.ktr b/pentaho/salesforce/SalesforceETL/account_history.ktr index 6775c3e..3dd5d5d 100644 --- a/pentaho/salesforce/SalesforceETL/account_history.ktr +++ b/pentaho/salesforce/SalesforceETL/account_history.ktr @@ -429,7 +429,7 @@ - 2017/11/28 16:18:41.510 - - 2018/02/05 14:13:40.349 + 2018/02/05 16:07:08.169 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -512,7 +512,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 120 + 60000 N AccountHistory diff --git a/pentaho/salesforce/SalesforceETL/contact.ktr b/pentaho/salesforce/SalesforceETL/contact.ktr index 30ff9e4..7fa7723 100644 --- a/pentaho/salesforce/SalesforceETL/contact.ktr +++ b/pentaho/salesforce/SalesforceETL/contact.ktr @@ -429,7 +429,7 @@ - 2017/11/28 12:56:29.933 - - 2018/02/05 14:04:51.009 + 2018/02/05 16:06:18.133 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -512,7 +512,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 120 + 60000 N Contact diff --git a/pentaho/salesforce/SalesforceETL/lead.ktr b/pentaho/salesforce/SalesforceETL/lead.ktr index 7ccf579..44d0f8a 100644 --- a/pentaho/salesforce/SalesforceETL/lead.ktr +++ b/pentaho/salesforce/SalesforceETL/lead.ktr @@ -429,7 +429,7 @@ - 2017/11/28 13:35:36.579 - - 2018/02/05 14:04:34.919 + 2018/02/05 16:05:54.978 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -549,7 +549,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 120 + 60000 N Lead diff --git a/pentaho/salesforce/SalesforceETL/master_job.kjb b/pentaho/salesforce/SalesforceETL/master_job.kjb index 41e462b..242e414 100644 --- a/pentaho/salesforce/SalesforceETL/master_job.kjb +++ b/pentaho/salesforce/SalesforceETL/master_job.kjb @@ -8,7 +8,7 @@ - 2017/11/27 15:58:57.677 - - 2018/02/05 14:13:42.028 + 2018/02/05 16:09:28.096 diff --git a/pentaho/salesforce/SalesforceETL/opportunity.ktr b/pentaho/salesforce/SalesforceETL/opportunity.ktr index 7c72e49..baf2e5a 100644 --- a/pentaho/salesforce/SalesforceETL/opportunity.ktr +++ b/pentaho/salesforce/SalesforceETL/opportunity.ktr @@ -429,7 +429,7 @@ - 2017/11/28 13:45:24.325 - - 2018/02/05 14:04:19.168 + 2018/02/05 16:05:27.875 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -549,7 +549,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 60 + 60000 N Opportunity @@ -1090,10 +1090,52 @@ none N + + Dashboard Project ID + Dashboard_Project_ID__c + Y + String + + + + + 255 + 0 + none + N + + + Date Eng Report Sent + Date_Eng_Report_Sent__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date HPD Call + Date_HPD_Call__c + N + String + + + + + 155 + 0 + none + N + Kissflow Project ID Kissflow_Project_ID__c - Y + N String @@ -1296,6 +1338,18 @@ BP Enterprise Client BP Enterprise Client + + Dashboard Project ID + Dashboard Project ID + + + Date Eng Report Sent + Date Eng Report Sent + + + Date HPD Call + Date HPD Call + Kissflow Project ID Kissflow Project ID diff --git a/pentaho/salesforce/SalesforceETL/opportunity_history.ktr b/pentaho/salesforce/SalesforceETL/opportunity_history.ktr index 4d36979..0901514 100644 --- a/pentaho/salesforce/SalesforceETL/opportunity_history.ktr +++ b/pentaho/salesforce/SalesforceETL/opportunity_history.ktr @@ -429,7 +429,7 @@ - 2017/11/28 16:24:11.196 - - 2018/02/05 14:05:32.914 + 2018/02/05 16:06:37.378 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -549,7 +549,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 120 + 60000 N OpportunityHistory diff --git a/pentaho/salesforce/SalesforceETL/project_location.ktr b/pentaho/salesforce/SalesforceETL/project_location.ktr index f8b4e23..40cc23b 100644 --- a/pentaho/salesforce/SalesforceETL/project_location.ktr +++ b/pentaho/salesforce/SalesforceETL/project_location.ktr @@ -429,7 +429,7 @@ - 2017/11/28 16:20:53.550 - - 2018/02/05 14:05:47.643 + 2018/02/05 16:06:47.074 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -549,7 +549,7 @@ ${Salesforce_PROD_host} ${Salesforce_PROD_user} ${Salesforce_PROD_password} - 120 + 60000 N ProjectLocation__c -- GitLab From b6b7f2944a57161658bf4f10a691a1f5397f2271 Mon Sep 17 00:00:00 2001 From: Conrad Date: Mon, 19 Feb 2018 15:20:00 -0500 Subject: [PATCH 3/4] Add new fields --- pentaho/salesforce/SalesforceETL/account.ktr | 2 +- .../SalesforceETL/account_contact.ktr | 2 +- .../SalesforceETL/account_history.ktr | 2 +- pentaho/salesforce/SalesforceETL/contact.ktr | 2 +- pentaho/salesforce/SalesforceETL/lead.ktr | 6 +- .../salesforce/SalesforceETL/master_job.kjb | 79 +++--- .../salesforce/SalesforceETL/opportunity.ktr | 224 +++++++++++------- .../SalesforceETL/opportunity_history.ktr | 2 +- .../SalesforceETL/project_location.ktr | 2 +- .../salesforce/SalesforceETL/repository.log | 4 + 10 files changed, 187 insertions(+), 138 deletions(-) diff --git a/pentaho/salesforce/SalesforceETL/account.ktr b/pentaho/salesforce/SalesforceETL/account.ktr index b04ecd0..e6c65e9 100644 --- a/pentaho/salesforce/SalesforceETL/account.ktr +++ b/pentaho/salesforce/SalesforceETL/account.ktr @@ -429,7 +429,7 @@ - 2017/11/27 16:00:41.942 - - 2018/02/05 16:06:28.638 + 2018/02/19 12:09:53.260 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N diff --git a/pentaho/salesforce/SalesforceETL/account_contact.ktr b/pentaho/salesforce/SalesforceETL/account_contact.ktr index bd6186f..d9acdd1 100644 --- a/pentaho/salesforce/SalesforceETL/account_contact.ktr +++ b/pentaho/salesforce/SalesforceETL/account_contact.ktr @@ -429,7 +429,7 @@ - 2017/11/28 16:22:20.522 - - 2018/02/05 16:07:00.113 + 2018/02/19 12:10:05.855 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N diff --git a/pentaho/salesforce/SalesforceETL/account_history.ktr b/pentaho/salesforce/SalesforceETL/account_history.ktr index 3dd5d5d..3735dd8 100644 --- a/pentaho/salesforce/SalesforceETL/account_history.ktr +++ b/pentaho/salesforce/SalesforceETL/account_history.ktr @@ -429,7 +429,7 @@ - 2017/11/28 16:18:41.510 - - 2018/02/05 16:07:08.169 + 2018/02/19 12:10:12.268 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N diff --git a/pentaho/salesforce/SalesforceETL/contact.ktr b/pentaho/salesforce/SalesforceETL/contact.ktr index 7fa7723..189181c 100644 --- a/pentaho/salesforce/SalesforceETL/contact.ktr +++ b/pentaho/salesforce/SalesforceETL/contact.ktr @@ -429,7 +429,7 @@ - 2017/11/28 12:56:29.933 - - 2018/02/05 16:06:18.133 + 2018/02/19 12:10:09.275 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N diff --git a/pentaho/salesforce/SalesforceETL/lead.ktr b/pentaho/salesforce/SalesforceETL/lead.ktr index 44d0f8a..cd599ba 100644 --- a/pentaho/salesforce/SalesforceETL/lead.ktr +++ b/pentaho/salesforce/SalesforceETL/lead.ktr @@ -429,7 +429,7 @@ - 2017/11/28 13:35:36.579 - - 2018/02/05 16:05:54.978 + 2018/02/19 12:09:47.200 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -1786,8 +1786,8 @@ - 375 - 171 + 384 + 176 Y diff --git a/pentaho/salesforce/SalesforceETL/master_job.kjb b/pentaho/salesforce/SalesforceETL/master_job.kjb index 242e414..2758a97 100644 --- a/pentaho/salesforce/SalesforceETL/master_job.kjb +++ b/pentaho/salesforce/SalesforceETL/master_job.kjb @@ -8,7 +8,7 @@ - 2017/11/27 15:58:57.677 - - 2018/02/05 16:09:28.096 + 2018/02/19 12:09:20.242 @@ -759,33 +759,6 @@ PGPASSWORD="${DB_password}" \ Y Y - - Email error - Restore database - 0 - 0 - Y - N - Y - - - Restore database - Abort job - 0 - 0 - Y - N - Y - - - contact - Write To Log - 0 - 0 - Y - N - N - contact account @@ -850,8 +823,8 @@ PGPASSWORD="${DB_password}" \ N - Backup database - lead + account + opportunity_history 0 0 Y @@ -859,8 +832,8 @@ PGPASSWORD="${DB_password}" \ N - account - opportunity_history + account_contact + account_history 0 0 Y @@ -868,17 +841,17 @@ PGPASSWORD="${DB_password}" \ N - account_contact - account_history + opportunity_history + Write To Log 0 0 Y - Y + N N - account_history - Success + Backup database + lead 0 0 Y @@ -886,7 +859,7 @@ PGPASSWORD="${DB_password}" \ N - opportunity_history + account_contact Write To Log 0 0 @@ -895,7 +868,7 @@ PGPASSWORD="${DB_password}" \ N - project_location + account_history Write To Log 0 0 @@ -904,21 +877,39 @@ PGPASSWORD="${DB_password}" \ N - account_contact - Write To Log + SQL + SQL 2 0 0 Y - N + Y + N + + + Email error + Restore database + 0 + 0 + Y + Y + N + + + Restore database + Abort job + 0 + 0 + Y + Y N account_history - Write To Log + Success 0 0 Y - N + Y N diff --git a/pentaho/salesforce/SalesforceETL/opportunity.ktr b/pentaho/salesforce/SalesforceETL/opportunity.ktr index baf2e5a..10d6b3c 100644 --- a/pentaho/salesforce/SalesforceETL/opportunity.ktr +++ b/pentaho/salesforce/SalesforceETL/opportunity.ktr @@ -429,7 +429,7 @@ - 2017/11/28 13:45:24.325 - - 2018/02/05 16:05:27.875 + 2018/02/19 12:10:02.690 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -656,34 +656,6 @@ none N - - Amount - Amount - N - String - - - - - 0 - 18 - none - N - - - Probability (%) - Probability - N - String - - - - - 0 - 3 - none - N - Close Date CloseDate @@ -992,34 +964,6 @@ none N - - Tracking Number - LiquidPlanner__TrackingNumber__c - N - String - - - - - 12 - 0 - none - N - - - Latest Sync - Latest_Sync__c - N - Date - yyyy-MM-dd'T'HH:mm:ss'.000'XXX - - - - -1 - -1 - none - N - ProjectDashboardProjectID ProjectDashboard_ID__c @@ -1105,8 +1049,8 @@ N - Date Eng Report Sent - Date_Eng_Report_Sent__c + Date Project Report Sent + Date_Project_Report_Sent__c N Date yyyy-MM-dd @@ -1119,33 +1063,131 @@ N - Date HPD Call - Date_HPD_Call__c + Kissflow Project ID + Kissflow_Project_ID__c N String - 155 + 255 0 none N - Kissflow Project ID - Kissflow_Project_ID__c + Date HPD Pipeline + Date_HPD_Pipeline__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Out to Bid + Date_Out_to_Bid__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date In Construction + Date_In_Construction__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Complete + Date_Complete__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Initiated Contact + Date_Initiated_Contact__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Retrofits Installed + Retrofits_Installed__c N String - 255 + 32768 0 none N + + Date HPD Call + Date_HPD_Call__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Inactive + Date_Inactive__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + 0 @@ -1214,14 +1256,6 @@ Stage Stage - - Amount - Amount - - - Probability (%) - Probability (%) - Close Date Close Date @@ -1310,14 +1344,6 @@ Quote ID Quote ID - - Tracking Number - Tracking Number - - - Latest Sync - Latest Sync - ProjectDashboardProjectID ProjectDashboardProjectID @@ -1343,16 +1369,44 @@ Dashboard Project ID - Date Eng Report Sent - Date Eng Report Sent + Date Project Report Sent + Date Project Report Sent + + + Kissflow Project ID + Kissflow Project ID + + + Date HPD Pipeline + Date HPD Pipeline + + + Date Out to Bid + Date Out to Bid + + + Date In Construction + Date In Construction + + + Date Complete + Date Complete + + + Date Initiated Contact + Date Initiated Contact + + + Retrofits Installed + Retrofits Installed Date HPD Call Date HPD Call - Kissflow Project ID - Kissflow Project ID + Date Inactive + Date Inactive diff --git a/pentaho/salesforce/SalesforceETL/opportunity_history.ktr b/pentaho/salesforce/SalesforceETL/opportunity_history.ktr index 0901514..a4929de 100644 --- a/pentaho/salesforce/SalesforceETL/opportunity_history.ktr +++ b/pentaho/salesforce/SalesforceETL/opportunity_history.ktr @@ -429,7 +429,7 @@ - 2017/11/28 16:24:11.196 - - 2018/02/05 16:06:37.378 + 2018/02/19 12:09:55.597 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N diff --git a/pentaho/salesforce/SalesforceETL/project_location.ktr b/pentaho/salesforce/SalesforceETL/project_location.ktr index 40cc23b..38071d9 100644 --- a/pentaho/salesforce/SalesforceETL/project_location.ktr +++ b/pentaho/salesforce/SalesforceETL/project_location.ktr @@ -429,7 +429,7 @@ - 2017/11/28 16:20:53.550 - - 2018/02/05 16:06:47.074 + 2018/02/19 12:09:59.055 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N diff --git a/pentaho/salesforce/SalesforceETL/repository.log b/pentaho/salesforce/SalesforceETL/repository.log index cb65119..0b7ee2a 100644 --- a/pentaho/salesforce/SalesforceETL/repository.log +++ b/pentaho/salesforce/SalesforceETL/repository.log @@ -3,3 +3,7 @@ Save database : Modification by user Save repository element : customer_db : Modification by user Save database : Modification by user Save repository element : customer_db : Modification by user +Save database : Modification by user +Save repository element : customer_db : Modification by user +Save database : Modification by user +Save repository element : customer_db : Modification by user -- GitLab From 7ac28316c3d4d4fd9264a9fea8f76c7d6f95b8dc Mon Sep 17 00:00:00 2001 From: Conrad Date: Wed, 7 Mar 2018 22:44:56 -0500 Subject: [PATCH 4/4] Update with new project_location fields --- pentaho/salesforce/SalesforceETL/account.ktr | 2 +- .../SalesforceETL/account_contact.ktr | 2 +- .../SalesforceETL/account_history.ktr | 2 +- pentaho/salesforce/SalesforceETL/contact.ktr | 20 +- pentaho/salesforce/SalesforceETL/lead.ktr | 20 +- .../salesforce/SalesforceETL/master_job.kjb | 11 +- .../salesforce/SalesforceETL/opportunity.ktr | 30 +- .../SalesforceETL/opportunity_history.ktr | 2 +- .../SalesforceETL/project_location.ktr | 2310 ++++++++++++++++- 9 files changed, 2365 insertions(+), 34 deletions(-) diff --git a/pentaho/salesforce/SalesforceETL/account.ktr b/pentaho/salesforce/SalesforceETL/account.ktr index e6c65e9..8889b7f 100644 --- a/pentaho/salesforce/SalesforceETL/account.ktr +++ b/pentaho/salesforce/SalesforceETL/account.ktr @@ -429,7 +429,7 @@ - 2017/11/27 16:00:41.942 - - 2018/02/19 12:09:53.260 + 2018/03/07 16:28:50.006 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N diff --git a/pentaho/salesforce/SalesforceETL/account_contact.ktr b/pentaho/salesforce/SalesforceETL/account_contact.ktr index d9acdd1..7df347d 100644 --- a/pentaho/salesforce/SalesforceETL/account_contact.ktr +++ b/pentaho/salesforce/SalesforceETL/account_contact.ktr @@ -429,7 +429,7 @@ - 2017/11/28 16:22:20.522 - - 2018/02/19 12:10:05.855 + 2018/03/07 16:29:22.624 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N diff --git a/pentaho/salesforce/SalesforceETL/account_history.ktr b/pentaho/salesforce/SalesforceETL/account_history.ktr index 3735dd8..ff86b95 100644 --- a/pentaho/salesforce/SalesforceETL/account_history.ktr +++ b/pentaho/salesforce/SalesforceETL/account_history.ktr @@ -429,7 +429,7 @@ - 2017/11/28 16:18:41.510 - - 2018/02/19 12:10:12.268 + 2018/03/07 16:30:02.501 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N diff --git a/pentaho/salesforce/SalesforceETL/contact.ktr b/pentaho/salesforce/SalesforceETL/contact.ktr index 189181c..3a1dfe1 100644 --- a/pentaho/salesforce/SalesforceETL/contact.ktr +++ b/pentaho/salesforce/SalesforceETL/contact.ktr @@ -429,7 +429,7 @@ - 2017/11/28 12:56:29.933 - - 2018/02/19 12:10:09.275 + 2018/03/07 16:29:44.477 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -1081,6 +1081,20 @@ none N + + MC Subscriber + MC4SF__MC_Subscriber__c + N + String + + + + + 18 + 0 + none + N + 0 @@ -1281,6 +1295,10 @@ Primary Phone Primary Phone + + MC Subscriber + MC Subscriber + diff --git a/pentaho/salesforce/SalesforceETL/lead.ktr b/pentaho/salesforce/SalesforceETL/lead.ktr index cd599ba..8cae675 100644 --- a/pentaho/salesforce/SalesforceETL/lead.ktr +++ b/pentaho/salesforce/SalesforceETL/lead.ktr @@ -429,7 +429,7 @@ - 2017/11/28 13:35:36.579 - - 2018/02/19 12:09:47.200 + 2018/03/07 16:28:12.181 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -1776,6 +1776,20 @@ none N + + MC Subscriber + MC4SF__MC_Subscriber__c + N + String + + + + + 18 + 0 + none + N + 0 @@ -2164,6 +2178,10 @@ Company Type Company Type + + MC Subscriber + MC Subscriber + diff --git a/pentaho/salesforce/SalesforceETL/master_job.kjb b/pentaho/salesforce/SalesforceETL/master_job.kjb index 2758a97..ba9c66d 100644 --- a/pentaho/salesforce/SalesforceETL/master_job.kjb +++ b/pentaho/salesforce/SalesforceETL/master_job.kjb @@ -8,7 +8,7 @@ - 2017/11/27 15:58:57.677 - - 2018/02/19 12:09:20.242 + 2018/02/19 18:16:48.371 @@ -876,15 +876,6 @@ PGPASSWORD="${DB_password}" \ N N - - SQL - SQL 2 - 0 - 0 - Y - Y - N - Email error Restore database diff --git a/pentaho/salesforce/SalesforceETL/opportunity.ktr b/pentaho/salesforce/SalesforceETL/opportunity.ktr index 10d6b3c..7f880ea 100644 --- a/pentaho/salesforce/SalesforceETL/opportunity.ktr +++ b/pentaho/salesforce/SalesforceETL/opportunity.ktr @@ -429,7 +429,7 @@ - 2017/11/28 13:45:24.325 - - 2018/02/19 12:10:02.690 + 2018/03/07 16:30:16.793 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -1147,22 +1147,22 @@ N - Retrofits Installed - Retrofits_Installed__c + Date HPD Call + Date_HPD_Call__c N - String - + Date + yyyy-MM-dd - 32768 - 0 + -1 + -1 none N - Date HPD Call - Date_HPD_Call__c + Date Inactive + Date_Inactive__c N Date yyyy-MM-dd @@ -1175,8 +1175,8 @@ N - Date Inactive - Date_Inactive__c + Date Engaged + Date_Engaged__c N Date yyyy-MM-dd @@ -1396,10 +1396,6 @@ Date Initiated Contact Date Initiated Contact - - Retrofits Installed - Retrofits Installed - Date HPD Call Date HPD Call @@ -1408,6 +1404,10 @@ Date Inactive Date Inactive + + Date Engaged + Date Engaged + diff --git a/pentaho/salesforce/SalesforceETL/opportunity_history.ktr b/pentaho/salesforce/SalesforceETL/opportunity_history.ktr index a4929de..2aacd00 100644 --- a/pentaho/salesforce/SalesforceETL/opportunity_history.ktr +++ b/pentaho/salesforce/SalesforceETL/opportunity_history.ktr @@ -429,7 +429,7 @@ - 2017/11/28 16:24:11.196 - - 2018/02/19 12:09:55.597 + 2018/03/07 16:29:06.680 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N diff --git a/pentaho/salesforce/SalesforceETL/project_location.ktr b/pentaho/salesforce/SalesforceETL/project_location.ktr index 38071d9..e4f874a 100644 --- a/pentaho/salesforce/SalesforceETL/project_location.ktr +++ b/pentaho/salesforce/SalesforceETL/project_location.ktr @@ -429,7 +429,7 @@ - 2017/11/28 16:20:53.550 - - 2018/02/19 12:09:59.055 + 2018/03/07 16:30:38.292 H4sIAAAAAAAAAAMAAAAAAAAAAAA= N @@ -530,8 +530,8 @@ - 384 - 176 + 352 + 192 Y @@ -1468,6 +1468,1798 @@ none N + + PNS Maintenance Issues - 1 + PNS_Maintenance_Issues_1__c + N + String + + + + + 255 + 0 + none + N + + + PNS Maintenance Issues - 2 + PNS_Maintenance_Issues_2__c + N + String + + + + + 255 + 0 + none + N + + + PNS Maintenance Issues - 3 + PNS_Maintenance_Issues_3__c + N + String + + + + + 255 + 0 + none + N + + + PNS Maintenance Issues - 4 + PNS_Maintenance_Issues_4__c + N + String + + + + + 255 + 0 + none + N + + + PNS Maintenance Issues - 5 + PNS_Maintenance_Issues_5__c + N + String + + + + + 255 + 0 + none + N + + + PNS Major (Mod Rehab) - 1 + PNS_Major_Mod_Rehab_1__c + N + String + + + + + 255 + 0 + none + N + + + PNS Major (Mod Rehab) - 2 + PNS_Major_Mod_Rehab_2__c + N + String + + + + + 255 + 0 + none + N + + + PNS Major (Mod Rehab) - 3 + PNS_Major_Mod_Rehab_3__c + N + String + + + + + 255 + 0 + none + N + + + PNS Major (Mod Rehab) - 4 + PNS_Major_Mod_Rehab_4__c + N + String + + + + + 255 + 0 + none + N + + + PNS Major (Mod Rehab) - 5 + PNS_Major_Mod_Rehab_5__c + N + String + + + + + 255 + 0 + none + N + + + PNS Major (Mod Rehab) - 6 + PNS_Major_Mod_Rehab_6__c + N + String + + + + + 255 + 0 + none + N + + + PNS Major (Mod Rehab) - 7 + PNS_Major_Mod_Rehab_7__c + N + String + + + + + 255 + 0 + none + N + + + PNS Major (Mod Rehab) - 8 + PNS_Major_Mod_Rehab_8__c + N + String + + + + + 255 + 0 + none + N + + + PNS Major (Mod Rehab) - 9 + PNS_Major_Mod_Rehab_9__c + N + String + + + + + 255 + 0 + none + N + + + PNS Major (Mod Rehab) - 10 + PNS_Major_Mod_Rehab_10__c + N + String + + + + + 255 + 0 + none + N + + + PNS Minor (Direct Install) - 1 + PNS_Minor_Direct_Install_1__c + N + String + + + + + 255 + 0 + none + N + + + PNS Minor (Direct Install) - 2 + PNS_Minor_Direct_Install_2__c + N + String + + + + + 255 + 0 + none + N + + + PNS Minor (Direct Install) - 3 + PNS_Minor_Direct_Install_3__c + N + String + + + + + 255 + 0 + none + N + + + PNS Minor (Direct Install) - 4 + PNS_Minor_Direct_Install_4__c + N + String + + + + + 255 + 0 + none + N + + + PNS Minor (Direct Install) - 5 + PNS_Minor_Direct_Install_5__c + N + String + + + + + 255 + 0 + none + N + + + PNS Minor (Direct Install) - 6 + PNS_Minor_Direct_Install_6__c + N + String + + + + + 255 + 0 + none + N + + + PNS Minor (Direct Install) - 7 + PNS_Minor_Direct_Install_7__c + N + String + + + + + 255 + 0 + none + N + + + PNS Minor (Direct Install) - 8 + PNS_Minor_Direct_Install_8__c + N + String + + + + + 255 + 0 + none + N + + + PNS Minor (Direct Install) - 9 + PNS_Minor_Direct_Install_9__c + N + String + + + + + 255 + 0 + none + N + + + PNS Minor (Direct Install) - 10 + PNS_Minor_Direct_Install_10__c + N + String + + + + + 255 + 0 + none + N + + + Sq Ft for Deemed Savings + Square_Footage_for_Deemed_Savings__c + N + Number + + + + + 0 + 18 + none + N + + + Residential Units + Residential_Units__c + N + Number + + + + + 0 + 5 + none + N + + + Diagnostic Maintenance Issues - 1 + Diagnostic_Maintenance_Issues_1__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Maintenance Issues - 2 + Diagnostic_Maintenance_Issues_2__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Maintenance Issues - 3 + Diagnostic_Maintenance_Issues_3__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Maintenance Issues - 4 + Diagnostic_Maintenance_Issues_4__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Maintenance Issues - 5 + Diagnostic_Maintenance_Issues_5__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Major (Mod Rehab) - 1 + Diagnostic_Major_Mod_Rehab_1__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Major (Mod Rehab) - 2 + Diagnostic_Major_Mod_Rehab_2__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Major (Mod Rehab) - 3 + Diagnostic_Major_Mod_Rehab_3__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Major (Mod Rehab) - 4 + Diagnostic_Major_Mod_Rehab_4__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Major (Mod Rehab) - 5 + Diagnostic_Major_Mod_Rehab_5__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Major (Mod Rehab) - 6 + Diagnostic_Major_Mod_Rehab_6__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Major (Mod Rehab) - 7 + Diagnostic_Major_Mod_Rehab_7__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Major (Mod Rehab) - 8 + Diagnostic_Major_Mod_Rehab_8__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Major (Mod Rehab) - 9 + Diagnostic_Major_Mod_Rehab_9__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Major (Mod Rehab) - 10 + Diagnostic_Major_Mod_Rehab_10__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Minor (Direct Install) - 1 + Diagnostic_Minor_Direct_Install_1__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Minor (Direct Install) - 2 + Diagnostic_Minor_Direct_Install_2__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Minor (Direct Install) - 3 + Diagnostic_Minor_Direct_Install_3__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Minor (Direct Install) - 4 + Diagnostic_Minor_Direct_Install_4__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Minor (Direct Install) - 5 + Diagnostic_Minor_Direct_Install_5__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Minor (Direct Install) - 6 + Diagnostic_Minor_Direct_Install_6__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Minor (Direct Install) - 7 + Diagnostic_Minor_Direct_Install_7__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Minor (Direct Install) - 8 + Diagnostic_Minor_Direct_Install_8__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Minor (Direct Install) - 9 + Diagnostic_Minor_Direct_Install_9__c + N + String + + + + + 255 + 0 + none + N + + + Diagnostic Minor (Direct Install) - 10 + Diagnostic_Minor_Direct_Install_10__c + N + String + + + + + 255 + 0 + none + N + + + Completed Maintenance Issues - 1 + Completed_Maintenance_Issues_1__c + N + String + + + + + 255 + 0 + none + N + + + Completed Maintenance Issues - 2 + Completed_Maintenance_Issues_2__c + N + String + + + + + 255 + 0 + none + N + + + Completed Maintenance Issues - 3 + Completed_Maintenance_Issues_3__c + N + String + + + + + 255 + 0 + none + N + + + Completed Maintenance Issues - 4 + Completed_Maintenance_Issues_4__c + N + String + + + + + 255 + 0 + none + N + + + Completed Maintenance Issues - 5 + Completed_Maintenance_Issues_5__c + N + String + + + + + 255 + 0 + none + N + + + Completed Major (Mod Rehab) - 1 + Completed_Major_Mod_Rehab_1__c + N + String + + + + + 255 + 0 + none + N + + + Completed Major (Mod Rehab) - 2 + Completed_Major_Mod_Rehab_2__c + N + String + + + + + 255 + 0 + none + N + + + Completed Major (Mod Rehab) - 3 + Completed_Major_Mod_Rehab_3__c + N + String + + + + + 255 + 0 + none + N + + + Completed Major (Mod Rehab) - 4 + Completed_Major_Mod_Rehab_4__c + N + String + + + + + 255 + 0 + none + N + + + Completed Major (Mod Rehab) - 5 + Completed_Major_Mod_Rehab_5__c + N + String + + + + + 255 + 0 + none + N + + + Completed Major (Mod Rehab) - 6 + Completed_Major_Mod_Rehab_6__c + N + String + + + + + 255 + 0 + none + N + + + Completed Major (Mod Rehab) - 7 + Completed_Major_Mod_Rehab_7__c + N + String + + + + + 255 + 0 + none + N + + + Completed Major (Mod Rehab) - 8 + Completed_Major_Mod_Rehab_8__c + N + String + + + + + 255 + 0 + none + N + + + Completed Major (Mod Rehab) - 9 + Completed_Major_Mod_Rehab_9__c + N + String + + + + + 255 + 0 + none + N + + + Completed Major (Mod Rehab) - 10 + Completed_Major_Mod_Rehab_10__c + N + String + + + + + 255 + 0 + none + N + + + Completed Minor (Direct Install) - 1 + Completed_Minor_Direct_Install_1__c + N + String + + + + + 255 + 0 + none + N + + + Completed Minor (Direct Install) - 2 + Completed_Minor_Direct_Install_2__c + N + String + + + + + 255 + 0 + none + N + + + Completed Minor (Direct Install) - 3 + Completed_Minor_Direct_Install_3__c + N + String + + + + + 255 + 0 + none + N + + + Completed Minor (Direct Install) - 4 + Completed_Minor_Direct_Install_4__c + N + String + + + + + 255 + 0 + none + N + + + Completed Minor (Direct Install) - 5 + Completed_Minor_Direct_Install_5__c + N + String + + + + + 255 + 0 + none + N + + + Completed Minor (Direct Install) - 6 + Completed_Minor_Direct_Install_6__c + N + String + + + + + 255 + 0 + none + N + + + Completed Minor (Direct Install) - 7 + Completed_Minor_Direct_Install_7__c + N + String + + + + + 255 + 0 + none + N + + + Completed Minor (Direct Install) - 8 + Completed_Minor_Direct_Install_8__c + N + String + + + + + 255 + 0 + none + N + + + Completed Minor (Direct Install) - 9 + Completed_Minor_Direct_Install_9__c + N + String + + + + + 255 + 0 + none + N + + + Completed Minor (Direct Install) - 10 + Completed_Minor_Direct_Install_10__c + N + String + + + + + 255 + 0 + none + N + + + Date Completed Maint 1 + Date_Completed_Maint_1__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Maint 2 + Date_Completed_Maint_2__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Maint 3 + Date_Completed_Maint_3__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Maint 4 + Date_Completed_Maint_4__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Maint 5 + Date_Completed_Maint_5__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Major 1 + Date_Completed_Major_1__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Major 2 + Date_Completed_Major_2__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Major 3 + Date_Completed_Major_3__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Major 4 + Date_Completed_Major_4__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Major 5 + Date_Completed_Major_5__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Major 6 + Date_Completed_Major_6__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Major 7 + Date_Completed_Major_7__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Major 8 + Date_Completed_Major_8__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Major 9 + Date_Completed_Major_9__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Major 10 + Date_Completed_Major_10__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Minor 1 + Date_Completed_Minor_1__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Minor 2 + Date_Completed_Minor_2__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Minor 3 + Date_Completed_Minor_3__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Minor 4 + Date_Completed_Minor_4__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Minor 5 + Date_Completed_Minor_5__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Minor 6 + Date_Completed_Minor_6__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Minor 7 + Date_Completed_Minor_7__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Minor 8 + Date_Completed_Minor_8__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Minor 9 + Date_Completed_Minor_9__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Date Completed Minor 10 + Date_Completed_Minor_10__c + N + Date + yyyy-MM-dd + + + + -1 + -1 + none + N + + + Projected Energy Savings (mmBTU) + Energy_Savings_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Projected Cost Savings (USD) + Projected_Cost_Savings_USD__c + N + Number + + + + + 0 + 12 + none + N + + + Projected CO2 Savings (Metric Ton) + CO2_Savings_Metric_Ton__c + N + Number + + + + + 0 + 12 + none + N + + + Projected PM 2.5 Savings (Pounds) + Projected_PM_2_5_Savings_Pounds__c + N + Number + + + + + 0 + 12 + none + N + + + Projected Natural Gas Savings (mmBTU) + Projected_Natural_Gas_Savings_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Projected #2 Dual Fuel (mmBTU) + Projected_2_Dual_Fuel_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Projected Electricity Savings (mmBTU) + Projected_Electricity_Savings_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Projected Water Savings (Gallons) + Projected_Water_Savings_Gallons__c + N + Number + + + + + 0 + 12 + none + N + + + Projected #4 Dual Fuel (mmBTU) + Projected_4_Dual_Fuel_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Projected #6 Dual Fuel (mmBTU) + Projected_6_Dual_Fuel_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Projected #2 Oil Savings (mmBTU) + Projected_2_Oil_Savings_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Projected #4 Oil Savings (mmBTU) + Projected_4_Oil_Savings_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Projected #6 Oil Savings (mmBTU) + Projected_6_Oil_Savings_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Completed Energy Savings (mmBTU) + Completed_Energy_Savings_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Completed Cost Savings (USD) + Completed_Cost_Savings_USD__c + N + Number + + + + + 0 + 12 + none + N + + + Completed CO2 Savings (Metric Ton) + Completed_CO2_Savings_Metric_Ton__c + N + Number + + + + + 0 + 12 + none + N + + + Completed PM 2.5 Savings (Pounds) + Completed_PM_2_5_Savings_Pounds__c + N + Number + + + + + 0 + 12 + none + N + + + Completed Natural Gas Savings (mmBTU) + Completed_Natural_Gas_Savings_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Completed Electricity Savings (mmBTU) + Completed_Electricity_Savings_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Completed #2 Oil Savings (mmBTU) + Completed_2_Oil_Savings_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Completed #4 Oil Savings (mmBTU) + Completed_4_Oil_Savings_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Completed #6 Oil Savings (mmBTU) + Completed_6_Oil_Savings_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Completed #2 Dual Fuel (mmBTU) + Completed_2_Dual_Fuel_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Completed #4 Dual Fuel (mmBTU) + Completed_4_Dual_Fuel_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Completed #6 Dual Fuel (mmBTU) + Completed_6_Dual_Fuel_mmBTU__c + N + Number + + + + + 0 + 12 + none + N + + + Completed Water Savings (Gallons) + Completed_Water_Savings_Gallons__c + N + Number + + + + + 0 + 12 + none + N + 0 @@ -1768,6 +3560,518 @@ HPD Score Greater than 75 HPD Score Greater than 75 + + PNS Maintenance Issues - 1 + PNS Maintenance Issues - 1 + + + PNS Maintenance Issues - 2 + PNS Maintenance Issues - 2 + + + PNS Maintenance Issues - 3 + PNS Maintenance Issues - 3 + + + PNS Maintenance Issues - 4 + PNS Maintenance Issues - 4 + + + PNS Maintenance Issues - 5 + PNS Maintenance Issues - 5 + + + PNS Major (Mod Rehab) - 1 + PNS Major (Mod Rehab) - 1 + + + PNS Major (Mod Rehab) - 2 + PNS Major (Mod Rehab) - 2 + + + PNS Major (Mod Rehab) - 3 + PNS Major (Mod Rehab) - 3 + + + PNS Major (Mod Rehab) - 4 + PNS Major (Mod Rehab) - 4 + + + PNS Major (Mod Rehab) - 5 + PNS Major (Mod Rehab) - 5 + + + PNS Major (Mod Rehab) - 6 + PNS Major (Mod Rehab) - 6 + + + PNS Major (Mod Rehab) - 7 + PNS Major (Mod Rehab) - 7 + + + PNS Major (Mod Rehab) - 8 + PNS Major (Mod Rehab) - 8 + + + PNS Major (Mod Rehab) - 9 + PNS Major (Mod Rehab) - 9 + + + PNS Major (Mod Rehab) - 10 + PNS Major (Mod Rehab) - 10 + + + PNS Minor (Direct Install) - 1 + PNS Minor (Direct Install) - 1 + + + PNS Minor (Direct Install) - 2 + PNS Minor (Direct Install) - 2 + + + PNS Minor (Direct Install) - 3 + PNS Minor (Direct Install) - 3 + + + PNS Minor (Direct Install) - 4 + PNS Minor (Direct Install) - 4 + + + PNS Minor (Direct Install) - 5 + PNS Minor (Direct Install) - 5 + + + PNS Minor (Direct Install) - 6 + PNS Minor (Direct Install) - 6 + + + PNS Minor (Direct Install) - 7 + PNS Minor (Direct Install) - 7 + + + PNS Minor (Direct Install) - 8 + PNS Minor (Direct Install) - 8 + + + PNS Minor (Direct Install) - 9 + PNS Minor (Direct Install) - 9 + + + PNS Minor (Direct Install) - 10 + PNS Minor (Direct Install) - 10 + + + Sq Ft for Deemed Savings + Sq Ft for Deemed Savings + + + Residential Units + Residential Units + + + Diagnostic Maintenance Issues - 1 + Diagnostic Maintenance Issues - 1 + + + Diagnostic Maintenance Issues - 2 + Diagnostic Maintenance Issues - 2 + + + Diagnostic Maintenance Issues - 3 + Diagnostic Maintenance Issues - 3 + + + Diagnostic Maintenance Issues - 4 + Diagnostic Maintenance Issues - 4 + + + Diagnostic Maintenance Issues - 5 + Diagnostic Maintenance Issues - 5 + + + Diagnostic Major (Mod Rehab) - 1 + Diagnostic Major (Mod Rehab) - 1 + + + Diagnostic Major (Mod Rehab) - 2 + Diagnostic Major (Mod Rehab) - 2 + + + Diagnostic Major (Mod Rehab) - 3 + Diagnostic Major (Mod Rehab) - 3 + + + Diagnostic Major (Mod Rehab) - 4 + Diagnostic Major (Mod Rehab) - 4 + + + Diagnostic Major (Mod Rehab) - 5 + Diagnostic Major (Mod Rehab) - 5 + + + Diagnostic Major (Mod Rehab) - 6 + Diagnostic Major (Mod Rehab) - 6 + + + Diagnostic Major (Mod Rehab) - 7 + Diagnostic Major (Mod Rehab) - 7 + + + Diagnostic Major (Mod Rehab) - 8 + Diagnostic Major (Mod Rehab) - 8 + + + Diagnostic Major (Mod Rehab) - 9 + Diagnostic Major (Mod Rehab) - 9 + + + Diagnostic Major (Mod Rehab) - 10 + Diagnostic Major (Mod Rehab) - 10 + + + Diagnostic Minor (Direct Install) - 1 + Diagnostic Minor (Direct Install) - 1 + + + Diagnostic Minor (Direct Install) - 2 + Diagnostic Minor (Direct Install) - 2 + + + Diagnostic Minor (Direct Install) - 3 + Diagnostic Minor (Direct Install) - 3 + + + Diagnostic Minor (Direct Install) - 4 + Diagnostic Minor (Direct Install) - 4 + + + Diagnostic Minor (Direct Install) - 5 + Diagnostic Minor (Direct Install) - 5 + + + Diagnostic Minor (Direct Install) - 6 + Diagnostic Minor (Direct Install) - 6 + + + Diagnostic Minor (Direct Install) - 7 + Diagnostic Minor (Direct Install) - 7 + + + Diagnostic Minor (Direct Install) - 8 + Diagnostic Minor (Direct Install) - 8 + + + Diagnostic Minor (Direct Install) - 9 + Diagnostic Minor (Direct Install) - 9 + + + Diagnostic Minor (Direct Install) - 10 + Diagnostic Minor (Direct Install) - 10 + + + Completed Maintenance Issues - 1 + Completed Maintenance Issues - 1 + + + Completed Maintenance Issues - 2 + Completed Maintenance Issues - 2 + + + Completed Maintenance Issues - 3 + Completed Maintenance Issues - 3 + + + Completed Maintenance Issues - 4 + Completed Maintenance Issues - 4 + + + Completed Maintenance Issues - 5 + Completed Maintenance Issues - 5 + + + Completed Major (Mod Rehab) - 1 + Completed Major (Mod Rehab) - 1 + + + Completed Major (Mod Rehab) - 2 + Completed Major (Mod Rehab) - 2 + + + Completed Major (Mod Rehab) - 3 + Completed Major (Mod Rehab) - 3 + + + Completed Major (Mod Rehab) - 4 + Completed Major (Mod Rehab) - 4 + + + Completed Major (Mod Rehab) - 5 + Completed Major (Mod Rehab) - 5 + + + Completed Major (Mod Rehab) - 6 + Completed Major (Mod Rehab) - 6 + + + Completed Major (Mod Rehab) - 7 + Completed Major (Mod Rehab) - 7 + + + Completed Major (Mod Rehab) - 8 + Completed Major (Mod Rehab) - 8 + + + Completed Major (Mod Rehab) - 9 + Completed Major (Mod Rehab) - 9 + + + Completed Major (Mod Rehab) - 10 + Completed Major (Mod Rehab) - 10 + + + Completed Minor (Direct Install) - 1 + Completed Minor (Direct Install) - 1 + + + Completed Minor (Direct Install) - 2 + Completed Minor (Direct Install) - 2 + + + Completed Minor (Direct Install) - 3 + Completed Minor (Direct Install) - 3 + + + Completed Minor (Direct Install) - 4 + Completed Minor (Direct Install) - 4 + + + Completed Minor (Direct Install) - 5 + Completed Minor (Direct Install) - 5 + + + Completed Minor (Direct Install) - 6 + Completed Minor (Direct Install) - 6 + + + Completed Minor (Direct Install) - 7 + Completed Minor (Direct Install) - 7 + + + Completed Minor (Direct Install) - 8 + Completed Minor (Direct Install) - 8 + + + Completed Minor (Direct Install) - 9 + Completed Minor (Direct Install) - 9 + + + Completed Minor (Direct Install) - 10 + Completed Minor (Direct Install) - 10 + + + Date Completed Maint 1 + Date Completed Maint 1 + + + Date Completed Maint 2 + Date Completed Maint 2 + + + Date Completed Maint 3 + Date Completed Maint 3 + + + Date Completed Maint 4 + Date Completed Maint 4 + + + Date Completed Maint 5 + Date Completed Maint 5 + + + Date Completed Major 1 + Date Completed Major 1 + + + Date Completed Major 2 + Date Completed Major 2 + + + Date Completed Major 3 + Date Completed Major 3 + + + Date Completed Major 4 + Date Completed Major 4 + + + Date Completed Major 5 + Date Completed Major 5 + + + Date Completed Major 6 + Date Completed Major 6 + + + Date Completed Major 7 + Date Completed Major 7 + + + Date Completed Major 8 + Date Completed Major 8 + + + Date Completed Major 9 + Date Completed Major 9 + + + Date Completed Major 10 + Date Completed Major 10 + + + Date Completed Minor 1 + Date Completed Minor 1 + + + Date Completed Minor 2 + Date Completed Minor 2 + + + Date Completed Minor 3 + Date Completed Minor 3 + + + Date Completed Minor 4 + Date Completed Minor 4 + + + Date Completed Minor 5 + Date Completed Minor 5 + + + Date Completed Minor 6 + Date Completed Minor 6 + + + Date Completed Minor 7 + Date Completed Minor 7 + + + Date Completed Minor 8 + Date Completed Minor 8 + + + Date Completed Minor 9 + Date Completed Minor 9 + + + Date Completed Minor 10 + Date Completed Minor 10 + + + Projected Energy Savings (mmBTU) + Projected Energy Savings (mmBTU) + + + Projected Cost Savings (USD) + Projected Cost Savings (USD) + + + Projected CO2 Savings (Metric Ton) + Projected CO2 Savings (Metric Ton) + + + Projected PM 2.5 Savings (Pounds) + Projected PM 2.5 Savings (Pounds) + + + Projected Natural Gas Savings (mmBTU) + Projected Natural Gas Savings (mmBTU) + + + Projected #2 Dual Fuel (mmBTU) + Projected #2 Dual Fuel (mmBTU) + + + Projected Electricity Savings (mmBTU) + Projected Electricity Savings (mmBTU) + + + Projected Water Savings (Gallons) + Projected Water Savings (Gallons) + + + Projected #4 Dual Fuel (mmBTU) + Projected #4 Dual Fuel (mmBTU) + + + Projected #6 Dual Fuel (mmBTU) + Projected #6 Dual Fuel (mmBTU) + + + Projected #2 Oil Savings (mmBTU) + Projected #2 Oil Savings (mmBTU) + + + Projected #4 Oil Savings (mmBTU) + Projected #4 Oil Savings (mmBTU) + + + Projected #6 Oil Savings (mmBTU) + Projected #6 Oil Savings (mmBTU) + + + Completed Energy Savings (mmBTU) + Completed Energy Savings (mmBTU) + + + Completed Cost Savings (USD) + Completed Cost Savings (USD) + + + Completed CO2 Savings (Metric Ton) + Completed CO2 Savings (Metric Ton) + + + Completed PM 2.5 Savings (Pounds) + Completed PM 2.5 Savings (Pounds) + + + Completed Natural Gas Savings (mmBTU) + Completed Natural Gas Savings (mmBTU) + + + Completed Electricity Savings (mmBTU) + Completed Electricity Savings (mmBTU) + + + Completed #2 Oil Savings (mmBTU) + Completed #2 Oil Savings (mmBTU) + + + Completed #4 Oil Savings (mmBTU) + Completed #4 Oil Savings (mmBTU) + + + Completed #6 Oil Savings (mmBTU) + Completed #6 Oil Savings (mmBTU) + + + Completed #2 Dual Fuel (mmBTU) + Completed #2 Dual Fuel (mmBTU) + + + Completed #4 Dual Fuel (mmBTU) + Completed #4 Dual Fuel (mmBTU) + + + Completed #6 Dual Fuel (mmBTU) + Completed #6 Dual Fuel (mmBTU) + + + Completed Water Savings (Gallons) + Completed Water Savings (Gallons) + -- GitLab