Added data

src/components/communication/templateDetail.vue

@@ -8,16 +8,13 @@
         <div class="col-md-12">
           <div class="d-flex">
             <div class="p-2 mr-auto">
-              <h2>Detailed Item</h2>
+              <h2>Template - Detail</h2>
             </div>
             <div class="p-2">
-              <div class="btn btn-primary myBackground">Add New</div>
+              <div class="btn btn-primary myBackground" v-if="!editable" @click="onEdit()">Edit</div>
             </div>
             <div class="p-2">
-              <div class="btn btn-primary myBackground">Edit</div>
-            </div>
-            <div class="p-2">
-              <div class="btn btn-primary myBackground">Close</div>
+              <div class="btn btn-primary myBackground" @click="onClose()">Save/Close</div>
             </div>
           </div>
         </div>
@@ -32,7 +29,14 @@
                 <b>I</b>
               </span>
             </div>
-            <input class="form-control" type="number" step="any" name="levy" v-model="item.id" />
+            <input
+              class="form-control"
+              type="number"
+              step="any"
+              name="levy"
+              v-model="item.id"
+              disabled
+            />
           </div>
         </div>
         <div class="col-md-8 text-left">
@@ -43,7 +47,14 @@
                 <b>N</b>
               </span>
             </div>
-            <input class="form-control" type="text" step="any" name="levy" v-model="item.name" />
+            <input
+              class="form-control"
+              type="text"
+              step="any"
+              name="levy"
+              v-model="item.name"
+              :disabled="!CanEdit"
+            />
           </div>
         </div>
         <div class="col-md-12">
@@ -57,7 +68,14 @@
                 <b>S</b>
               </span>
             </div>
-            <input class="form-control" type="text" step="any" name="levy" v-model="item.subject" />
+            <input
+              class="form-control"
+              type="text"
+              step="any"
+              name="levy"
+              v-model="item.subject"
+              :disabled="!CanEdit"
+            />
           </div>
         </div>
         <div class="col-md-12">
@@ -112,6 +130,7 @@
                     step="any"
                     name="levy"
                     v-model="item.body"
+                    :disabled="!CanEdit"
                   />
                 </div>
               </div>
@@ -135,28 +154,35 @@
               <h2>Coded Fields</h2>
             </div>
             <div class="p-2">
-              <div class="btn btn-primary myBackground" @click="addClose()">{{btnCaption}}</div>
+              <div
+                class="btn btn-primary myBackground"
+                @click="addClose()"
+                v-if="CanEdit"
+              >{{btnCaption}}</div>
             </div>
           </div>
         </div>
-        <div
-          class="col-md-12"
-          v-if="showNew"
-          style="background-color:rgba(255,255,255,0.75); border:silver solid thin;border-radius:10px;padding:10px;padding:10px 30px;"
-        >
-          <TemplateInnerItem />
+        <div class="col-md-12" v-if="showNew">
+          <TemplateInnerItem @onItemAdd="onItemAdd" />
         </div>
         <div class="col-md-12">
           <hr />
         </div>
         <div class="col-md-12">
-          <ListView :items="item.placeHolders" :hideSearch="true" />
+          <ListView
+            :items="item.placeHolders"
+            :hideSearch="true"
+            :showNew="false"
+            :deleteable="CanEdit"
+            @onDelete="onItemDelete"
+          />
         </div>
       </div>
     </div>
   </div>
 </template>
 <script>
+import { mapActions } from 'vuex';
 import ListView from '../shared/listView.vue';
 import TemplateInnerItem from './templateInnerItem.vue';
 
@@ -164,6 +190,7 @@ export default {
   data() {
     return {
       showNew: false,
+      openFields: false,
     };
   },
   components: {
@@ -172,18 +199,58 @@ export default {
   },
   props: {
     item: {},
+    editable: {
+      default: false,
+    },
   },
   computed: {
+    CanEdit() {
+      return this.editable || this.item.id === 0 || this.openFields;
+    },
     btnCaption() {
       return this.showNew ? 'Close' : 'New';
     },
+    ItemList() {
+      return this.item.placeHolders;
+    },
   },
   methods: {
+    ...mapActions('template', ['addItem', 'editItem']),
     addClose() {
       if (this.showNew) {
         this.showNew = false;
       } else this.showNew = true;
     },
+    onClose() {
+      if (this.item.id > 0) {
+        // edit
+        this.editItem(this.item);
+      } else {
+        // add.
+        this.addItem(this.item);
+      }
+      console.log(JSON.stringify(this.item));
+      this.$emit('onClose');
+    },
+    onItemDelete(item) {
+      this.item.placeHolders = _.remove(
+        this.item.placeHolders,
+        x => x !== item,
+      );
+    },
+    onEdit() {
+      this.openFields = true;
+    },
+    onItemAdd(item) {
+      const myList = this.item.placeHolders ? this.item.placeHolders : [];
+      myList.push({
+        name: item.name,
+        boundTo: item.property,
+        boundToClassDisplay: item.class.name,
+        boundToClass: item.class.fullName,
+      });
+      this.item.placeHolders = myList;
+    },
   },
 };
 </script>

src/components/communication/templateInnerItem.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="row">
+    <div class="col-md-12" v-if="message !== undefined">
+      <Alert :text="message" :type="'ERROR'" />
+    </div>
     <div class="col-md-3">
       <input
         class="form-control"
@@ -21,19 +24,24 @@
       </select>
     </div>
     <div class="col-md-3">
-      <div class="btn btn-primary myBackground w-100">Add</div>
+      <div class="btn btn-primary myBackground w-100" @click="onItemAdd()">Add</div>
     </div>
   </div>
 </template>
 <script>
 import { mapState, mapActions } from 'vuex';
+import Alert from '../shared/alert.vue';
 
 export default {
+  components: {
+    Alert,
+  },
   mounted() {
     this.init();
   },
   data() {
     return {
+      message: undefined,
       item: {
         name: undefined,
         class: undefined,
@@ -49,6 +57,23 @@ export default {
     onClassChanged() {
       this.getProperties(this.item.class);
     },
+    onItemAdd() {
+      let msg = '';
+      if (this.item.name === undefined) {
+        msg += 'Please give a name...';
+      }
+      if (this.item.class == undefined) {
+        msg += 'Please choose a class...';
+      }
+      if (this.item.property == undefined) {
+        msg += 'Please choose a property...';
+      }
+      if (msg.length > 0) {
+        this.message = msg;
+      } else {
+        this.$emit('onItemAdd', this.item);
+      }
+    },
   },
 };
 </script>

src/components/communication/templatePage.vue

@@ -13,10 +13,10 @@
     </div>
     <div class="row">
       <div :class="listClass">
-        <ListView :items="list" @onRowClick="onRowClick" />
+        <ListView :items="list" @onRowClick="onRowClick" @onNew="onNew" :showNew="true" />
       </div>
       <div class="col-md-6" v-if="showDetailView">
-        <DetailView :item="detailItem" />
+        <DetailView :item="detailItem" @onClose="onDetailClose" :editable="clickedNew" />
       </div>
     </div>
 
@@ -33,6 +33,7 @@ export default {
   data() {
     return {
       detailItem: undefined,
+      clickedNew: false,
     };
   },
   components: {
@@ -56,8 +57,15 @@ export default {
   methods: {
     ...mapActions('template', ['getList']),
     onRowClick(item) {
-      console.log(item);
       this.detailItem = item;
+      this.clickedNew = false;
+    },
+    onNew() {
+      this.detailItem = {};
+      this.clickedNew = true;
+    },
+    onDetailClose() {
+      this.detailItem = undefined;
     },
   },
 };

src/components/shared/listView.vue

@@ -2,10 +2,13 @@
 /* eslint-disable guard-for-in */
 <template>
   <div>
-    <div class="d-flex justify-content-between" v-if="!hideSearch">
-      <div class="p-2">
+    <div class="d-flex justify-content-between">
+      <div class="p-2" v-if="!hideSearch">
         <input v-model="searchItem" class="form-control" placeholder="Search ..." />
       </div>
+      <div class="p-2" v-if="showNew">
+        <div class="btn btn-primary myBackground" @click="onNew()">New</div>
+      </div>
     </div>
     <div v-if="items && items.length > 0">
       <table id="table" class="table table-bordered table-hover">
@@ -96,6 +99,9 @@ export default {
     hideSearch: {
       default: false,
     },
+    showNew: {
+      default: true,
+    },
     items: undefined,
     editable: {
       default: false,
@@ -119,6 +125,9 @@ export default {
     };
   },
   methods: {
+    onNew() {
+      this.$emit('onNew');
+    },
     isObject(item) {
       return !!item && item.constructor === Object;
     },

src/components/timeshare/sell/sellPage.vue

@@ -296,7 +296,7 @@
                 </div>
               </div>
             </div>
-            <DetailIndividual :currentUser="sellItem.owner" :showBank="true" />
+            <DetailIndividual :currentUser="sellItem.owner" :showBank="true" :showAddress="true" />
             <hr />
           </div>
           <br />

src/store/modules/communication/template.js

@@ -5,6 +5,7 @@ export default {
   state: {
     list: [],
     item: {},
+    message: undefined,
   },
   mutations: {
     setList(state, list) {
@@ -21,5 +22,21 @@ export default {
         .then(result => commit('setList', result.data))
         .catch(console.error);
     },
+    addItem({
+      dispatch,
+    }, item) {
+      axios
+        .post('/api/template', item)
+        .then(() => dispatch('getList'))
+        .catch(console.error);
+    },
+    editItem({
+      dispatch,
+    }, item) {
+      axios
+        .put(`/api/template/${item.id}`, item)
+        .then(() => dispatch('getList'))
+        .catch(console.error);
+    },
   },
 };