diff --git a/Civi/Api4/Action/ContactCategory/GetFlows.php b/Civi/Api4/Action/ContactCategory/GetFlows.php index d86445d..18f1aee 100644 --- a/Civi/Api4/Action/ContactCategory/GetFlows.php +++ b/Civi/Api4/Action/ContactCategory/GetFlows.php @@ -306,7 +306,7 @@ class GetFlows extends \Civi\Api4\Generic\AbstractAction { // Don't use exchange array so as not to gazump non-array data(?) foreach ($data as $row) { $result[] = [ - 'from_category_id' => (int) (($row['from_category_id']) ?: $defaultCategoryId), + 'from_category_id' => (int) (($row['from_category_id'])), // ?: $defaultCategoryId, 'to_category_id' => (int) $row['to_category_id'], 'contact_count' => (int) $row['contact_count'], ]; diff --git a/ang/crmContactcats/crmContactCategoryFlows.html b/ang/crmContactcats/crmContactCategoryFlows.html index 3e0c6a9..17397d0 100644 --- a/ang/crmContactcats/crmContactCategoryFlows.html +++ b/ang/crmContactcats/crmContactCategoryFlows.html @@ -61,14 +61,14 @@ - - @@ -91,9 +91,8 @@ x=0 y="{{toAna.y}}" width="{{$ctrl.sankey.iconWidth}}" height="{{toAna.thisCatHeight}}"> + > diff --git a/ang/crmContactcats/crmContactCategoryFlows.js b/ang/crmContactcats/crmContactCategoryFlows.js index 135f936..24f4f68 100644 --- a/ang/crmContactcats/crmContactCategoryFlows.js +++ b/ang/crmContactcats/crmContactCategoryFlows.js @@ -16,6 +16,7 @@ let flowsData = ctrl.changesOnly ? allFlowsData.filter(({from_category_id, to_category_id}) => from_category_id != to_category_id) : allFlowsData; + console.log("flowsData", flowsData, ctrl.catDefs); ctrl.loading = false; const width = Math.max(600, document.querySelector('.contact-cats-sankey').clientWidth), @@ -61,11 +62,11 @@ let totalContacts = 0; flowsData.forEach(row => { const {from_category_id, to_category_id, contact_count} = row; - if (!from_category_id) { - // from nowhere: ignore for now. - console.log("Skipping", row); - return; - } + // if (!from_category_id) { + // // from nowhere: ignore for now. + // console.log("Skipping", row); + // return; + // } analysis[to_category_id].now += contact_count; if (!catDefsIndexed[from_category_id]) { console.log("from_category_id", from_category_id, "not found in defs", catDefsIndexed); @@ -192,6 +193,7 @@ }) ); } + ctrl.catDefs.push({ id: 0, label: ts('New'), color: '#6cf66c', icon: 'fa-add', presentation_order: ctrl.catDefs.length, search_type:'new'}); ctrl.loading = false; ctrl.catDefs.forEach(cat => {catDefsIndexed[cat.id] = cat;});