cityworks 0.0.28 → 0.0.32

package/dist/inspection.d.ts

@@ -266,7 +266,7 @@ export declare class Inspection {
      * @param {Array<string>} [entityTypes] - The Entity Type(s) to return potential inspections for
      * @param {boolean} [canCreate] - If true, only return templates the user can create, ignored if false or null, default is true
      * @param {Object} [options] - An object which can include: [IncludeInactive]: boolean, MaximumDateModified: Date, MinimumDateModified: Date, TemplateIds: Array<number>
-     * @return {Object} Returns Promise that represents a collection of all possible employees for an Inspection's SubmitTo
+     * @return {Object} Returns Promise that represents a collection of all Inspections matching the provided parameters
      */
     getTemplates(entityTypes?: Array<string>, canCreate?: boolean, options?: {
         IncludeInactive?: boolean;

package/dist/inspection_admin.d.ts

@@ -7,4 +7,19 @@ export declare class InspectionAdmin {
      * @hidden
      */
     constructor(cw: any);
+    /**
+     * Get inspection templates
+     *
+     * @category Inspection Templates
+     * @param {Array<string>} [entityTypes] - The Entity Type(s) to return potential inspections for
+     * @param {boolean} [canCreate] - If true, only return templates the user can create, ignored if false or null, default is true
+     * @param {Object} [options] - An object which can include: [IncludeInactive]: boolean, MaximumDateModified: Date, MinimumDateModified: Date, TemplateIds: Array<number>
+     * @return {Object} Returns Promise that represents a collection of all Inspections matching the provided parameters
+     */
+    getTemplates(entityTypes?: Array<string>, canCreate?: boolean, options?: {
+        IncludeInactive?: boolean;
+        MaximumDateModified?: Date;
+        MinimumDateModified?: Date;
+        TemplateIds?: Array<number>;
+    }): Promise<unknown>;
 }

package/dist/request_admin.d.ts

@@ -7,4 +7,12 @@ export declare class RequestAdmin {
      * @hidden
      */
     constructor(cw: any);
+    /**
+     * Get service request templates
+     *
+     * @category Requests Admin
+     * @param {Object} searchData - search data
+     * @return {Object} Returns Promise that represents a collection of all Service Request Templates
+     */
+    getTemplates(searchData: Object): Promise<unknown>;
 }

package/dist/search.d.ts

@@ -90,22 +90,22 @@ export declare class Search {
      */
     getDefinition(searchId: number, employeeSid?: number): Promise<unknown>;
     /**
-     * Get search definition names
+     * Get search definitions
      *
      * @category Search Definitions
      * @param {Array<number>} searchIds - SearchIds to get.
-     * @return {Object} Returns Promise object that represents a collection of SearchDefinitionNames
+     * @param {number} employeeSid - Enforces employee security settings on search definition if provided.
+     * @return {Object} Returns Promise object that represents a collection of SearchDefinition objects
      */
-    getDefinitionNames(searchIds: Array<number>): Promise<unknown>;
+    getDefinitions(searchIds: Array<number>, employeeSid?: number): Promise<unknown>;
     /**
-     * Get search definitions
+     * Get search definition names
      *
      * @category Search Definitions
      * @param {Array<number>} searchIds - SearchIds to get.
-     * @param {number} employeeSid - Enforces employee security settings on search definition if provided.
-     * @return {Object} Returns Promise object that represents a collection of SearchDefinition objects
+     * @return {Object} Returns Promise object that represents a collection of SearchDefinitionNames
      */
-    getDefinitions(searchIds: Array<number>, employeeSid?: number): Promise<unknown>;
+    getDefinitionNames(searchIds: Array<number>): Promise<unknown>;
     /**
      * Delete search definitions
      *

package/dist/workorder_admin.d.ts

@@ -7,4 +7,105 @@ export declare class WorkOrderAdmin {
      * @hidden
      */
     constructor(cw: any);
+    /**
+     * Get entity groups
+     *
+     * @category WorkOrders Admin
+     * @return {Object} Returns Promise that represents a collection of all entity groups
+     */
+    getEntityGroups(): Promise<unknown>;
+    /**
+     * Get entity types
+     *
+     * @category WorkOrders Admin
+     * @return {Object} Returns Promise that represents a collection of all GIS Work Order entity types
+     */
+    getEntityTypes(entityGroups: Array<string>): Promise<unknown>;
+    /**
+     * Get work order templates
+     *
+     * @category WorkOrders Admin
+     * @return {Object} Returns Promise that represents a collection of all Work Order templates
+     */
+    getTemplates(entityType: string, includeComments?: boolean, includeInstructions?: boolean): Promise<unknown>;
+    /**
+     * Update Work Order template
+     *
+     * @category WorkOrders Admin
+     * @param {Object} wOTemplate - Obect that describes the Work Order Template
+     * @return {Object} Returns Promise that represents a collection of all
+     */
+    updateTemplate(wOTemplate: Object): Promise<unknown>;
+    /**
+     * Get template group rights for provided WorkOrder Templates
+     *
+     * @category WorkOrders Admin
+     * @param {Array<number>} wOTemplateIds - Array one or more WorkOrder Template IDs
+     * @return {Object} Returns Promise that represents a collection of all
+     */
+    getTemplateGroupRights(wOTemplateIds: Array<number>): Promise<unknown>;
+    /**
+     * Get template activity services for provided WorkOrder Templates
+     *
+     * @category WorkOrders Admin
+     * @param {Array<number>} wOTemplateIds - Array one or more WorkOrder Template IDs
+     * @return {Object} Returns Promise that represents a collection of all
+     */
+    getTemplateActivity(wOTemplateIds: Array<number>): Promise<unknown>;
+    /**
+     * Get fields which will be updated when provided WorkOrder Template instance closes
+     *
+     * @category WorkOrders Admin
+     * @param {Array<number>} wOTemplateIds - Array one or more WorkOrder Template IDs
+     * @return {Object} Returns Promise that represents a collection of all
+     */
+    getUpdateFields(wOTemplateIds: Array<number>): Promise<unknown>;
+    /**
+     * Get equipment
+     *
+     * @category WorkOrders Admin
+     * @param {Array<number>} wOTemplateIds - WorkOrder Template ID
+     * @return {Object} Returns Promise that represents a collection of all
+     */
+    getTemplateEquipment(wOTemplateId: number): Promise<unknown>;
+    /**
+     * Get labor
+     *
+     * @category WorkOrders Admin
+     * @param {Array<number>} wOTemplateIds - WorkOrder Template ID
+     * @return {Object} Returns Promise that represents a collection of all
+     */
+    getTemplateLabor(wOTemplateId: number): Promise<unknown>;
+    /**
+     * Get material
+     *
+     * @category WorkOrders Admin
+     * @param {number} wOTemplateId - WorkOrder Template ID
+     * @return {Object} Returns Promise that represents a collection of all
+     */
+    getTemplateMaterial(wOTemplateId: number): Promise<unknown>;
+    /**
+     * Get map layer fields configured for provided work order template
+     *
+     * @category WorkOrders Admin
+     * @param {number} wOTemplateId - WorkOrder Template ID
+     * @return {Object} Returns Promise that represents a collection of all
+     */
+    getTemplateMapLayerFields(wOTemplateId: number): Promise<unknown>;
+    /**
+     * Get tasks configured for provided work order template
+     *
+     * @category WorkOrders Admin
+     * @param {number} wOTemplateId - WorkOrder Template ID
+     * @return {Object} Returns Promise that represents a collection of all tasks on work order template
+     */
+    getTemplateTasks(wOTemplateId: number): Promise<unknown>;
+    /**
+     * Get inspections connected to provided work order template
+     *
+     * @category WorkOrders Admin
+     * @param {number} wOTemplateId - WorkOrder Template ID
+     * @return {Object} Returns Promise that represents a collection of all tasks on work order template
+     */
+    getRelatedInspectionTemplates(wOTemplateId: number): Promise<unknown>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cityworks",
-  "version": "0.0.28",
+  "version": "0.0.32",
   "description": "A Cityworks API wrapper",
   "main": "dist/index.js",
   "umd:main": "dist/index.umd.js",
@@ -12,7 +12,8 @@
   "scripts": {
     "dev": "microbundle watch",
     "build": "microbundle",
-    "test": "mocha --recursive --reporter spec ./test/",
+    "test": "mocha -R spec --recursive ./test/ -g ",
+    "fulltest": "mocha -R spec --recursive ./test/",
     "docs": "./node_modules/typedoc/bin/typedoc --tsconfig ./tsconfig.json"
   },
   "repository": {

package/src/activity_link.ts

@@ -2,14 +2,18 @@ import { CWError } from './error'
 import ReversibleMap from 'reversible-map'
 const _ = require('lodash')
 
-interface ActivityLink {
+/**
+ * ActivityLink interface for ActivityLinks
+ *
+ */
+export interface ActivityLink {
   linkTypes: ReversibleMap<string, number>
   activityTypes: ReversibleMap<string, number>
   cw: any
 }
 
 /**
- * ActivityLinks implements the activity link functions
+ * ActivityLinks implements the activity link functions via using the ActivityLink interface
  *
  */
 export class ActivityLinks implements ActivityLink {
@@ -89,6 +93,8 @@ export class ActivityLinks implements ActivityLink {
       let path = 'General/ActivityLink/Add'
       this.cw.runRequest(path, data).then((response: any) => {
         resolve(response.Value)
+      }).catch(e => {
+        reject(e)
       })
     })
   }
@@ -123,6 +129,8 @@ export class ActivityLinks implements ActivityLink {
           return_data.push(link)
         })
         resolve(return_data)
+      }).catch(e => {
+        reject(e)
       })
     })
   }
@@ -148,7 +156,7 @@ export class ActivityLinks implements ActivityLink {
         reject(new CWError(1, 'Source type not found.', {'provided': source_type, 'options':this.activityTypes}))
       }
       if(!this.activityTypes.has(destination_type)) {
-        reject(new CWError(1, 'Destination type not found.', {'provided': destination_type, 'options':this.activityTypes}))
+        reject(new CWError(2, 'Destination type not found.', {'provided': destination_type, 'options':this.activityTypes}))
       }
       let data = {
         SourceActivityType: this.activityTypes.get(source_type),
@@ -159,6 +167,8 @@ export class ActivityLinks implements ActivityLink {
       let path = 'General/ActivityLink/CloneByActivitySid'
       this.cw.runRequest(path, data).then((response: any) => {
         resolve(response.Value)
+      }).catch(e => {
+        reject(e)
       })
     })
   }
@@ -177,6 +187,8 @@ export class ActivityLinks implements ActivityLink {
       let path = 'General/ActivityLink/Delete'
       this.cw.runRequest(path, data).then((response: any) => {
         resolve(response.Value)
+      }).catch(e => {
+        reject(e)
       })
     })
   }
@@ -221,6 +233,8 @@ export class ActivityLinks implements ActivityLink {
       let path = 'General/ActivityLink/Remove'
       this.cw.runRequest(path, data).then((response: any) => {
         resolve(response.Value)
+      }).catch(e => {
+        reject(e)
       })
     })
   }

package/src/case.ts

@@ -212,7 +212,7 @@ export class Case {
       }).catch(e => {
         reject(e)
       })
-    });
+    })
   }
 
   /**
@@ -225,7 +225,7 @@ export class Case {
   delete(caObjectId: number) {
     return new Promise((resolve, reject) => {
       var data = {
-        CaObjectId: caObjectId,
+        CaObjectId: caObjectId
       }
       this.cw.runRequest('Pll/CaseObject/DeleteCase', data).then(r => {
         resolve(r.Value)

package/src/case_admin.ts

@@ -142,7 +142,7 @@ export class CaseAdmin {
    */
   searchCaseTypeIDs(filters: Object) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['CaseType', 'CaseTypeDesc', 'CaseTypeId']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['CaseType', 'CaseTypeDesc', 'CaseTypeId']).length==0) {
         reject(new CWError(2, 'At least one of the attributes (CaFeeId, CaObjectId, FeeCode, FeeDesc) must be defined.'))
       }
       var data = filters
@@ -163,7 +163,7 @@ export class CaseAdmin {
    */
   searchCaseTypeObjects(filters: Object) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['CaseType', 'CaseTypeDesc', 'CaseTypeId']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['CaseType', 'CaseTypeDesc', 'CaseTypeId']).length==0) {
         reject(new CWError(3, 'At least one of the attributes (CaseType, CaseTypeDesc, CaseTypeId) must be defined.'))
       }
       var data = filters
@@ -263,7 +263,7 @@ export class CaseAdmin {
    */
   searchFees(filters: {AccountCode?: string, FeeCode?: string, FeeDesc?: string, FeeSetupId?: number, FeeTypeId?: number}) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['AccountCode', 'FeeCode', 'FeeDesc', 'FeeSetupId', 'FeeTypeId']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['AccountCode', 'FeeCode', 'FeeDesc', 'FeeSetupId', 'FeeTypeId']).length==0) {
         reject(new CWError(4, 'At least one of the attributes (AccountCode, FeeCode, FeeDesc, FeeSetupId, FeeTypeId) must be defined.'))
       }
       var data = filters
@@ -338,7 +338,7 @@ export class CaseAdmin {
    */
   searchDeposits(filters: {AccountCode?: string, DepositCode?: string, DepositDesc?: string, DepositId?: number, DepositTypeId?: number}) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['AccountCode', 'DepositCode', 'DepositDesc', 'DepositId', 'DepositTypeId']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['AccountCode', 'DepositCode', 'DepositDesc', 'DepositId', 'DepositTypeId']).length==0) {
         reject(new CWError(4, 'At least one of the attributes (AccountCode, DepositCode, DepositDesc, DepositId, DepositTypeId) must be defined.'))
       }
       var data = filters

package/src/case_data.ts

@@ -143,7 +143,7 @@ export class CaseData {
    */
    searchForGroups(filters?: Object) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['CaDataGroupId', 'CaseDataGroupId', 'GroupCode', 'GroupDesc', 'GroupSum', 'SumFlag']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['CaDataGroupId', 'CaseDataGroupId', 'GroupCode', 'GroupDesc', 'GroupSum', 'SumFlag']).length==0) {
         reject(new CWError(2, 'At least one of the attributes (CaDataGroupId, CaseDataGroupId, GroupCode, GroupDesc, GroupSum, SumFlag) must be defined.'))
       }
       var data = filters
@@ -359,7 +359,7 @@ export class CaseData {
    */
    searchForListValueIds(filters?: Object) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['CaDataDetailId', 'CaDataListId', 'ListValue']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['CaDataDetailId', 'CaDataListId', 'ListValue']).length==0) {
         reject(new CWError(3, 'At least one of the attributes (CaDataDetailId, CaDataListId, ListValue) must be defined.'))
       }
       var data = filters
@@ -380,8 +380,8 @@ export class CaseData {
    */
    searchForListValueObjects(filters?: Object) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['CaDataDetailId', 'CaDataListId', 'ListValue']).length==0) {
-        reject(new CWError(3, 'At least one of the attributes (CaDataDetailId, CaDataListId, ListValue) must be defined.'))
+      if(_.intersectionBy(_.keysIn(filters), ['CaDataDetailId', 'CaDataListId', 'ListValue']).length==0) {
+        reject(new CWError(4, 'At least one of the attributes (CaDataDetailId, CaDataListId, ListValue) must be defined.'))
       }
       var data = filters
       this.cw.runRequest('Pll/CaseDataGroup/SearchObject', data).then(r => {

package/src/case_financial.ts

@@ -521,7 +521,7 @@ export class CaseFinancial {
    */
   searchFees(filters: Object) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['CaFeeId', 'CaObjectId', 'FeeCode', 'FeeDesc']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['CaFeeId', 'CaObjectId', 'FeeCode', 'FeeDesc']).length==0) {
         reject(new CWError(4, 'At least one of the attributes (CaFeeId, CaObjectId, FeeCode, FeeDesc) must be defined.'))
       }
       var data = filters
@@ -542,7 +542,7 @@ export class CaseFinancial {
    */
   searchPayments(filters: Object) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['CaPaymentId', 'CommentText', 'FeeAmount', 'FeeCode', 'FeeDesc', 'PaymentAccount', 'PaymentAmount', 'TenderType']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['CaPaymentId', 'CommentText', 'FeeAmount', 'FeeCode', 'FeeDesc', 'PaymentAccount', 'PaymentAmount', 'TenderType']).length==0) {
         reject(new CWError(5, 'At least one of the attributes (CaPaymentId, CommentText, FeeAmount, FeeCode, FeeDesc, PaymentAccount, PaymentAmount, TenderType) must be defined.'))
       }
       var data = filters
@@ -563,7 +563,7 @@ export class CaseFinancial {
    */
   searchRefunds(filters: Object) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['CaPaymentId', 'CaPaymentRefundId', 'Comments', 'RefundAmount']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['CaPaymentId', 'CaPaymentRefundId', 'Comments', 'RefundAmount']).length==0) {
         reject(new CWError(6, 'At least one of the attributes (CaPaymentId, CaPaymentRefundId, Comments, RefundAmount) must be defined.'))
       }
       var data = filters
@@ -584,7 +584,7 @@ export class CaseFinancial {
    */
   searchDeposits(filters: Object) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['CaDepositId', 'CaObjectId', 'DepositCode', 'DepositDesc']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['CaDepositId', 'CaObjectId', 'DepositCode', 'DepositDesc']).length==0) {
         reject(new CWError(1, 'At least one of the arguments (CaDepositId, CaObjectId, DepositCode, DepositDesc) must be defined.'))
       }
       var data = filters
@@ -622,7 +622,7 @@ export class CaseFinancial {
    */
   searchFeeTemplates(filters: Object) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['FeeSetupId', 'FeeTypeId', 'FeeCode', 'FeeDesc', 'AccountCode']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['FeeSetupId', 'FeeTypeId', 'FeeCode', 'FeeDesc', 'AccountCode']).length==0) {
         reject(new CWError(7, 'At least one of the arguments (FeeSetupId, FeeTypeId, FeeCode, FeeDesc, AccountCode) must be defined.'))
       }
       var data = filters
@@ -643,7 +643,7 @@ export class CaseFinancial {
    */
   searchCaseInstruments(filters: Object) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['AddressLine1', 'Amount', 'CaInstrumentId', 'CityName', 'CommentText', 'Company', 'ContactEmail', 'ContactName', 'ContactPhone', 'CountryCode', 'InstTypeId', 'SerialNumber', 'StateCode', 'ZipCode']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['AddressLine1', 'Amount', 'CaInstrumentId', 'CityName', 'CommentText', 'Company', 'ContactEmail', 'ContactName', 'ContactPhone', 'CountryCode', 'InstTypeId', 'SerialNumber', 'StateCode', 'ZipCode']).length==0) {
         reject(new CWError(9, 'At least one of the arguments (AddressLine1, Amount, CaInstrumentId, CityName, CommentText, Company, ContactEmail, ContactName, ContactPhone, CountryCode, InstTypeId, SerialNumber, StateCode, ZipCode) must be defined.'))
       }
       var data = filters
@@ -740,7 +740,7 @@ export class CaseFinancial {
   searchCaseInstrumentReleases(filters: Object) {
     return new Promise((resolve, reject) => {
       var data = filters
-      if(_.intersectionBy(filters, ['AmountReleased', 'CaInstReleasesId', 'CaInstrumentId', 'CommentText', 'PercentReleased', 'ReleasedBy']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['AmountReleased', 'CaInstReleasesId', 'CaInstrumentId', 'CommentText', 'PercentReleased', 'ReleasedBy']).length==0) {
         reject(new CWError(3, 'At least one of the attributes (AmountReleased, CaInstReleasesId, CaInstrumentId, CommentText, PercentReleased, ReleasedBy) must be defined.'))
       }
       this.cw.runRequest('Pll/CaseInstReleases/Search', data).then(r => {
@@ -776,7 +776,7 @@ export class CaseFinancial {
    */
   searchAvailableFees(filters: {AccountCode?: string, FeeCode?: string, FeeDesc?: string, FeeSetupId?: number, FeeTypeId?: number}) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['AccountCode', 'FeeCode', 'FeeDesc', 'FeeSetupId', 'FeeTypeId']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['AccountCode', 'FeeCode', 'FeeDesc', 'FeeSetupId', 'FeeTypeId']).length==0) {
         reject(new CWError(8, 'At least one of the attributes (AccountCode, FeeCode, FeeDesc, FeeSetupId, FeeTypeId) must be defined.'))
       }
       var data = filters

package/src/case_workflow.ts

@@ -275,7 +275,7 @@ export class CaseWorkflow {
       var data = {
         CaTaskId: caTaskId
       }
-      if(_.intersectionBy(options, ['TaskCompleteDate', 'TaskCompletedBy']).length==0) {
+      if(_.intersectionBy(_.keysIn(options), ['TaskCompleteDate', 'TaskCompletedBy']).length==0) {
         reject(new CWError(2, 'At least one of the attributes (TaskCompletedBy, TaskCompleteDate) must be defined.'))
       }
       if(typeof(options)!='undefined') {
@@ -358,7 +358,7 @@ export class CaseWorkflow {
    */
    searchForTasks(filters?: Object) {
     return new Promise((resolve, reject) => {
-      if(_.intersectionBy(filters, ['ResponsibleUserId', 'TaskAvailable', 'TaskComplete', 'TaskType']).length==0) {
+      if(_.intersectionBy(_.keysIn(filters), ['ResponsibleUserId', 'TaskAvailable', 'TaskComplete', 'TaskType']).length==0) {
         reject(new CWError(1, 'At least one of the attributes (ResponsibleUserId, TaskAvailable, TaskComplete, TaskType) must be defined.'))
       }
       var data = filters

package/src/cityworks.ts

@@ -225,7 +225,6 @@ module.exports = class Cityworks implements Citywork {
         },
         timeout: 10000000
       }
-
       let request = https.request(options, (response) => {
           let str=''
           response.on('error',function(e){
@@ -249,21 +248,34 @@ module.exports = class Cityworks implements Citywork {
                   // failed
                   reject(new CWError(10, 'No response received from Cityworks API.'))
                 } else if(typeof(obj)!='undefined' && typeof(obj.Value)!='undefined') { // && typeof(response.Value.Token)!='undefined') {
-                  // console.log(str, options, pd, obj)
-                  resolve(obj)
+                  switch(obj.Status) {
+                    case 1:
+                      reject(new CWError(1, 'Error', obj))
+                      break;
+                    case 2:
+                      reject(new CWError(2, 'Unauthorized', obj))
+                      break;
+                    case 3:
+                      reject(new CWError(3, 'InvalidCredentials', obj))
+                      break;
+                    case 0:
+                    default:
+                      resolve(obj);
+                      break;
+                  }
                 } else {
-                  reject(new CWError(3, "Unknown error.", {options: options, postedData: pd, api_returned_string: obj}))
+                  reject(new CWError(4, "Unknown error.", {options: options, postedData: pd, api_returned_string: obj}))
                 }
               } else {
-                reject(new CWError(1, "Error parsing JSON. Cityworks returned HTML.", {response: str}))
+                reject(new CWError(5, "Error parsing JSON. Cityworks returned HTML.", {response: str}))
               }
             } catch (e) {
               if (e instanceof SyntaxError) {
                 console.log('try/catch error on JSON')
-                reject(new CWError(1, "Error parsing JSON.", {error: e}))
+                reject(new CWError(6, "Error parsing JSON.", {error: e}))
               } else {
-                console.log('try/catch error on JSON')
-                reject(new CWError(1, "Error parsing JSON."))
+                console.log('try/catch error on JSON - but not an instance of SyntaxError')
+                reject(new CWError(7, "Error parsing JSON."))
               }
             }
           })
@@ -287,20 +299,20 @@ module.exports = class Cityworks implements Citywork {
         path = 'General/Authentication/CityworksOnlineAuthenticate'
       }
       this.runRequest(path, data).then((response: any) => {
-        if(response.Status>0) {
-          // failed
-          reject(new CWError(10, response.Message))
-        } else if(typeof(response.Value)!='undefined' && typeof(response.Value.Token)!='undefined') {
+        // if(response.Status>0) {
+        //   // failed
+        //   reject(new CWError(100, response.Message))
+        // } else if(typeof(response.Value)!='undefined' && typeof(response.Value.Token)!='undefined') {
           this.login = login
           this.password = password
           this.Token = response.Value.Token
           resolve(true)
-        } else {
-          // failed
-          reject(new CWError(11, 'Unknown Error'))
-        }
+        // } else {
+        //   // failed
+        //   reject(new CWError(11, 'Unknown Error'))
+        // }
       }).catch(error => {
-        reject(error)
+        reject(error);
       })
     })
   }

package/src/comments.ts

@@ -59,6 +59,8 @@ export class Comments {
       }
       this.cw.runRequest('Ams/Comment/Add', data).then((response: any) => {
         resolve(response.Value)
+      }).catch(e => {
+        reject(e)
       })
     })
   }
@@ -79,6 +81,8 @@ export class Comments {
       }
       this.cw.runRequest('Ams/Comment/Update', data).then((response: any) => {
         resolve(response.Value)
+      }).catch(e => {
+        reject(e)
       })
     })
   }
@@ -126,6 +130,8 @@ export class Comments {
       _.set(data, 'ActivityType', this.activityTypes.get(this.currentActivityType))
       this.cw.runRequest('Ams/Comment/PredefinedComments', data).then((response: any) => {
         resolve(response.Value)
+      }).catch(e => {
+        reject(e)
       })
     })
   }
@@ -152,7 +158,9 @@ export class Comments {
   //     console.log(data, 'data')
   //     this.cw.runRequest('Ams/Comment/ByActivityTypes', data).then((response: any) => {
   //       resolve(response.Value)
-  //     })
+  //     }).catch(e => {
+  //      reject(e)
+  //    })
   //   })
   // }
 

package/src/error.ts

@@ -1,4 +1,12 @@
-interface CWErrorInt {
+const _ = require('lodash')
+
+/**
+ * CWErrorInt interface definition for implementation by CWError
+ *
+ * `{name: string, code: number, message: string, info?: string}`
+ *
+ */
+export interface CWErrorInt {
   name: string
   code: number
   message: string
@@ -8,8 +16,6 @@ interface CWErrorInt {
 /**
  * CWError implements a custom error class for this codebase with additional information
  *
- * `{name: string, code:number, info: object}`
- *
  */
 export class CWError implements CWErrorInt {
   /**
@@ -42,6 +48,8 @@ export class CWError implements CWErrorInt {
     this.code = code
     this.message = message
     if(typeof(info) !== 'undefined') {
+      if(_.has(info, 'Message'))
+        this.message = _.get(info, 'Message')
       this.info = JSON.stringify(info)
     }
   }