Merge pull request #8 from CityOfPhiladelphia/main

adds 2nd phone number
CityOfPhiladelphia · Jan 2, 2025 · d84566c · d84566c
2 parents d32b3b8 + b240837
commit d84566c
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 79 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/ExpandCollapseContent.vue b/src/components/ExpandCollapseContent.vue
@@ -19,14 +19,15 @@
         </div>
 
         <div
-          v-if="item.attributes.PHONE"
+          v-if="item.attributes.program_phone"
           class="columns is-mobile"
         >
           <div class="column is-1">
             <font-awesome-icon icon="phone" />
           </div>
           <div class="column is-11">
-            {{ item.attributes.PHONE }}
+            <b>{{ $t('phone_org') }}:</b> {{ transformPhone(item.attributes.PHONE) }}<br>
+            <b>{{ $t('phone_program') }}:</b> {{ transformPhone(item.attributes.program_phone) }}
           </div>
         </div>
 
@@ -116,7 +117,6 @@
       </div>
 
       <div class="column is-6">
-
         <div
           v-if="item.attributes.RemoteProgrammingSelect"
           class="columns is-mobile"
@@ -174,11 +174,13 @@
             <b>{{ $t('timeOffered') }}:</b> {{ item.attributes.ProgramDirectoryStartTimeSelect }} - {{ item.attributes.ProgramDirectoryEndTimeSelect }}
           </div>
         </div>
-
       </div>
     </div>
 
-    <h3 v-if="this.hasFocusAreas" class="section-heading">
+    <h3
+      v-if="this.hasFocusAreas"
+      class="section-heading"
+    >
       {{ $t('focusArea.plural') }}
     </h3>
     <div v-if="this.artsAndCulture && this.artsAndCulture.length > 1">
@@ -203,7 +205,8 @@
     <h3 class="section-heading">
       {{ $t('details') }}
     </h3>
-    <div v-html="item.attributes.programdescription" />
+    <div v-html="item.attributes.servicedesc" />
+    <!-- <div v-html="item.attributes.programdescription" /> -->
 
     <br>
 
@@ -317,14 +320,14 @@ import { fr, vi, ru, es, enUS } from 'date-fns/locale';
 import * as zh from 'date-fns/locale/zh-CN/index.js';
 
 import SharedFunctions from '@phila/pinboard/src/components/mixins/SharedFunctions.vue';
-import { VueGoodTable } from 'vue-good-table';
+// import { VueGoodTable } from 'vue-good-table';
 
 import PrintShareSection from '@phila/pinboard/src/components/PrintShareSection';
 
 export default {
   name: 'ExpandCollapseContent',
   components: {
-    VueGoodTable,
+    // VueGoodTable,
     PrintShareSection,
   },
   mixins: [ SharedFunctions ],
@@ -567,6 +570,11 @@ export default {
     // console.log('ExpandCollapseContent.vue mounted, this.item.attributes.transit_subway.length:', this.item.attributes.transit_subway.length, 'this.item.attributes.transit_subway:', this.item.attributes.transit_subway);
   },
   methods: {
+    transformPhone(phoneNumber) {
+      var s2 = (""+phoneNumber).replace(/\D/g, '');
+      var m = s2.match(/^(\d{3})(\d{3})(\d{4})$/);
+      return (!m) ? null : "(" + m[1] + ") " + m[2] + "-" + m[3];
+    },
     getAges(item) {
       // console.log('getAges is running, item:', item);
       let options = [ 'isUnder5', 'is5to10', 'is11to13', 'is14to18', 'isAbove18' ];

diff --git a/src/data-sources/ost.js b/src/data-sources/ost.js
@@ -3,16 +3,17 @@ export default {
   type: 'http-get',
   dependent: 'none',
   resettable: false,
+  // url: 'https://stage.cityspan.com:8080/phillyost/service/getall',
   url: 'https://api.cityspan.com/phillyost/service/getall',
   options: {
     success: function(data) {
       console.log('ost.js success is running, data:', data);
-      let newData = { features: [] };
+      let newData = { features: []};
       for (let datum of data) {
         newData.features.push({
           attributes: datum,
           latlng: [ datum.latitude, datum.longitude ],
-        })
+        });
       }
       return newData;
     },

diff --git a/src/i18n/en-us.js b/src/i18n/en-us.js
@@ -8,6 +8,8 @@ export default {
       all: 'Search by address, zipcode, or program name',
     },
   },
+  phone_org: 'Organization Phone',
+  phone_program: 'Activity Phone',
   eligibility: 'Eligibility',
   pickupDetails: 'Pickup details',
   beforeYouGo: 'Before you go',