@simitgroup/simpleapp-generator 1.0.63 → 1.1.0

package/templates/nuxt/pages/[xorg]/organization/[id]/branches/new.vue

@@ -0,0 +1,149 @@
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp everytime regenerate code.
+ * delete file "delete-me-for-avoid-override" if you want to modify this file and
+ * prevent regenerate code override it.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+import ConfirmPopup from "primevue/confirmpopup";
+import { useConfirm } from "primevue/useconfirm";
+const confirm = useConfirm();
+
+const { $BranchDoc, $OrganizationDoc, $event } = useNuxtApp();
+const orgdoc = $OrganizationDoc();
+const doc = $BranchDoc();
+const data = doc.getReactiveData();
+const bid = ref(String(useRoute().params.bid ?? ""));
+
+const fetchRecord = async (id: string) => {
+  await doc.getById(id);
+};
+
+const disabled = computed(() => {
+  return false;
+});
+
+const createData = async () => {
+  doc
+    .create()
+    .then((res) => {
+      refresh();
+      goBranch(res.data.organization._id, res.data._id);
+    })
+    .catch((err) => {
+      console.error(err);
+    });
+};
+const updateData = async () => {
+  doc
+    .update()
+    .then(() => {
+      // visible.value=false
+      refresh();
+    })
+    .catch((err) => {
+      console.error(err);
+    });
+};
+const deleteData = (event: Event) => {
+  confirm.require({
+    target: event.currentTarget as HTMLElement,
+    message: "Delete?",
+    icon: "pi pi-exclamation-triangle",
+    acceptClass: "p-button-danger",
+    accept: () => {
+      // disabled.value=true
+      doc.delete(data.value._id ?? "").then((res) => {
+        refresh();
+        goTo(doc.getDocName());
+      });
+    },
+    reject: () => {
+      console.log("Cancel delete");
+    },
+  });
+};
+
+const refresh = () => {
+  $event("RefreshDocumentList", { documentName: doc.getDocName() });
+};
+
+if (bid.value) {
+  console.log("bid value", bid.value);
+  fetchRecord(bid.value);
+} else {
+  const orgRecordid = ref(String(useRoute().params.id));
+  const orgdata = (await orgdoc.getById(orgRecordid.value)).data;
+  doc.setNew();
+  data.value.tenantId = orgdata.tenantId;
+  data.value.orgId = orgdata.orgId;
+  data.value.organization._id = orgRecordid.value;
+  data.value.organization.label = orgdata.orgName;
+  data.value.organization.orgId = orgdata.orgId;
+  data.value.organization.code = orgdata.orgCode;
+}
+</script>
+<template>
+  <div class="grid grid-cols2">
+    <SimpleAppForm :document="doc" #default="o">
+      <div class="simpleapp-tool-bar col-span-4 text-left gap-4">
+        <!-- <Button
+                class=""
+                :disabled="disabled"
+                @click="newData"
+                type="button"
+                v-if="canPerform(doc.getDocName(), 'create')"
+                >New</Button
+              > -->
+        <Button
+          class="btn btn-primary"
+          :disabled="disabled"
+          @click="createData"
+          type="button"
+          v-if="canPerform(doc.getDocName(), 'create') && doc.isNew()"
+          >Create</Button
+        >
+        <Button
+          class="btn btn-primary"
+          :disabled="disabled"
+          @click="updateData"
+          type="button"
+          v-if="canPerform(doc.getDocName(), 'update') && !doc.isNew()"
+          >Update</Button
+        >
+        <Button
+          class="btn btn-danger"
+          :disabled="disabled"
+          @click="deleteData($event)"
+          type="button"
+          v-if="canPerform(doc.getDocName(), 'delete') && !doc.isNew()"
+          >Delete</Button
+        >
+
+        <ProgressSpinner
+          v-if="disabled == true"
+          style="width: 2rem; height: 2rem"
+        ></ProgressSpinner>
+        <ConfirmPopup></ConfirmPopup>
+      </div>
+      <SimpleAppText
+        v-model="data.branchCode"
+        :setting="o.getField('#/properties/branchCode')"
+      />
+      <SimpleAppText
+        v-model="data.branchName"
+        :setting="o.getField('#/properties/branchName')"
+      />
+      <SimpleAppCheckbox
+        v-model="data.active"
+        :setting="o.getField('#/properties/active')"
+      />
+      <SimpleAppTextarea
+        v-model="data.description"
+        :setting="o.getField('#/properties/description')"
+      />      
+    </SimpleAppForm>
+    <DebugDocumentData v-model="data" label="branch" />
+  </div>
+</template>

package/templates/nuxt/pages/[xorg]/organization/[id]/index.vue.eta

@@ -0,0 +1 @@
+<template></template>

package/templates/nuxt/pages/[xorg]/organization/new.vue.eta

@@ -0,0 +1,151 @@
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp everytime regenerate code.
+ * delete file "delete-me-for-avoid-override" if you want to modify this file and
+ * prevent regenerate code override it.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+ import { SimpleAppInputType } from "~/types";
+import ConfirmPopup from "primevue/confirmpopup";
+import { useConfirm } from "primevue/useconfirm";
+const confirm = useConfirm();
+
+const { $BranchDoc, $OrganizationDoc, $event } = useNuxtApp();
+const orgdoc = $OrganizationDoc();
+const doc = $BranchDoc();
+const data = doc.getReactiveData();
+const bid = ref(String(useRoute().params.bid ?? ""));
+const isReadOnly = ref(true);
+const fetchRecord = async (id: string) => {
+  await doc.getById(id);
+};
+
+const disabled = computed(() => {
+  return false;
+});
+
+const createData = async () => {
+  doc
+    .create()
+    .then((res) => {
+      refresh();
+      goBranch(res.data._id);
+    })
+    .catch((err) => {
+      console.error(err);
+    });
+};
+const updateData = async () => {
+  doc
+    .update()
+    .then(() => {
+      // visible.value=false
+      refresh();
+    })
+    .catch((err) => {
+      console.error(err);
+    });
+};
+const deleteData = (event: Event) => {
+  confirm.require({
+    target: event.currentTarget as HTMLElement,
+    message: "Delete?",
+    icon: "pi pi-exclamation-triangle",
+    acceptClass: "p-button-danger",
+    accept: () => {
+      // disabled.value=true
+      doc.delete(data.value._id ?? "").then((res) => {
+        refresh();
+
+        goTo(doc.getDocName());
+      });
+    },
+    reject: () => {
+      console.log("Cancel delete");
+    },
+  });
+};
+
+const refresh = () => {
+  $event("RefreshDocumentList", { documentName: doc.getDocName() });
+  isReadOnly.value = true;
+};
+
+if (bid.value) {
+  fetchRecord(bid.value);
+} else {
+  // const orgRecordid = ref(String(useRoute().params.id));
+  // const orgdata = (await orgdoc.getById(orgRecordid.value)).data;
+  doc.setNew();
+  isReadOnly.value = false;
+  data.value.tenantId = getUserProfile().tenantId;
+  data.value.orgId = getUserProfile().orgId;
+  data.value.organization._id = getUserProfile().orgRecordId;
+  data.value.organization.label = getUserProfile().orgName;
+  data.value.organization.orgId = getUserProfile().orgId;
+  data.value.organization.code = getUserProfile().orgCode;
+}
+</script>
+<template>
+  <div class="grid grid-cols2">
+    <SimpleAppForm :document="doc" #default="o" :readonly="isReadOnly">
+      <div v-if="!isReadOnly" class="col-span-4 text-left gap-4">
+        <Button
+          class="btn btn-primary"
+          :isReadOnly="isReadOnly"
+          @click="createData"
+          type="button"
+          v-if="canPerform(doc.getDocName(), 'create') && doc.isNew()"
+          >Create</Button
+        >
+        <Button
+          class="btn btn-primary"
+          @click="updateData"
+          type="button"
+          v-if="canPerform(doc.getDocName(), 'update') && !doc.isNew()"
+          >Update</Button
+        >
+        <Button
+          class="btn btn-danger"
+          @click="deleteData($event)"
+          type="button"
+          v-if="canPerform(doc.getDocName(), 'delete') && !doc.isNew()"
+          >Delete</Button
+        >
+
+        <ConfirmPopup></ConfirmPopup>
+      </div>
+      <div v-else class="col-span-4 text-left gap-4">
+        <Button
+          class="btn btn-primary"
+          @click="isReadOnly = false"
+          type="button"
+          >Edit</Button
+        >
+      </div>
+
+      <SimpleAppInput
+        :input-type="SimpleAppInputType.text"
+        v-model="data.branchCode"
+        :setting="o.getField('#/properties/branchCode')"
+      />
+      <SimpleAppInput
+        :input-type="SimpleAppInputType.text"
+        v-model="data.branchName"
+        :setting="o.getField('#/properties/branchName')"
+      />
+      <SimpleAppInput
+        :input-type="SimpleAppInputType.checkbox"
+        v-model="data.active"
+        :setting="o.getField('#/properties/active')"
+      />
+      <SimpleAppInput
+        :input-type="SimpleAppInputType.textarea"
+        v-model="data.description"
+        :setting="o.getField('#/properties/description')"
+      />
+    </SimpleAppForm>
+    <DebugDocumentData v-model="data" label="branch" />
+  </div>
+</template>

package/templates/nuxt/pages/[xorg]/organization.vue.eta

@@ -0,0 +1,145 @@
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp everytime regenerate code.
+ * delete file "delete-me-for-avoid-override" if you want to modify this file and
+ * prevent regenerate code override it.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+ import { SimpleAppInputType } from "~/types";
+import ConfirmPopup from "primevue/confirmpopup";
+import { useConfirm } from "primevue/useconfirm";
+const confirm = useConfirm();
+
+const { $OrganizationDoc, $BranchDoc, $event, $listen } = useNuxtApp();
+const doc = $OrganizationDoc();
+const brancdoc = $BranchDoc();
+const data = doc.getReactiveData();
+const branchlist = ref([]);
+const isReadOnly = ref(true);
+const getCurrentOrg = async () => {
+  await doc.getById(getUserProfile().orgRecordId);
+};
+const fetchRecord = async (id: string) => {
+  await doc.getById(id);
+  branchlist.value = await brancdoc.search({
+    filter: { orgId: data.value.orgId },
+  });
+};
+
+const id = computed((): string => String(useRoute().params.id ?? ""));
+const updateData = async () => {
+  doc
+    .update()
+    .then(() => {
+      refresh();
+      isReadOnly.value = true;
+    })
+    .catch((err) => {
+      console.error(err);
+    });
+};
+
+const refresh = () => {
+  $event("RefreshDocumentList", { documentName: doc.getDocName() });
+};
+
+//branch record update then reload
+$listen("RefreshDocumentList", (data) => {
+  console.log("refresh from branch", data.documentName, "==", doc.getDocName());
+  if (data.documentName == "branch") {
+    fetchRecord(id.value);
+  }
+});
+
+if (id) {
+  fetchRecord(id.value);
+}
+
+getCurrentOrg();
+</script>
+<template>
+  <div class="grid grid-cols-3">
+    <div class="">
+      <Card>
+        <template #header><h1 class="text-2xl">Organization</h1></template>
+        <template #content>
+          <SimpleAppForm #default="o" :document="doc" :readonly="isReadOnly">
+            <div
+              class="simpleapp-tool-bar col-span-4 text-left gap-4"
+              v-if="canPerform(doc.getDocName(), 'update')"
+            >
+              <Button
+                v-if="isReadOnly"
+                class="btn btn-primary"
+                @click="isReadOnly = false"
+                type="button"
+                >Edit</Button
+              >
+              <Button
+                v-else
+                class="btn btn-primary"
+                @click="updateData"
+                type="button"
+                >Update</Button
+              >
+              <ConfirmPopup></ConfirmPopup>
+            </div>
+            <div class="flex flex-col">
+              <div class="flex flex-row gap-4">
+                <SimpleAppInput
+                  :input-type="SimpleAppInputType.text"
+                  autofocus
+                  v-model="data.orgCode"
+                  :setting="o.getField('#/properties/orgCode')"
+                />
+                <SimpleAppInput
+                  :input-type="SimpleAppInputType.text"
+                  v-model="data.orgName"
+                  class=""
+                  :setting="o.getField('#/properties/orgName')"
+                />
+                <SimpleAppInput
+                :input-type="SimpleAppInputType.checkbox"
+                  v-model="data.active"
+                  :setting="o.getField('#/properties/active')"
+                />
+              </div>
+              <div>
+                <SimpleAppInput
+                  :input-type="SimpleAppInputType.textarea"
+                  :setting="o.getField('#/properties/description')"
+                  v-model="data.description"
+                />
+              </div>
+            </div>
+            <DebugDocumentData v-model="data" label="organization" />
+          </SimpleAppForm>
+        </template>
+      </Card>
+    </div>
+    <div>
+      <Card>
+        <template #header>
+          <!-- <h1 class="text-2xl font-bold">{{ data.orgName }}</h1> -->
+        </template>
+        <template #content>
+          <div class="">
+            <h1>Branches</h1>
+            <Button @click="goBranch('new')">New</Button>
+            <ListView
+              :list="branchlist"
+              title-field="branchName"
+              sub-title-field="branchCode"
+              :url="getDocumentUrl('organization', id)"
+            >
+            </ListView>
+          </div>
+        </template>
+      </Card>
+    </div>
+    <div>
+      <NuxtPage></NuxtPage>
+    </div>
+  </div>
+</template>

package/templates/nuxt/pages/[xorg]/user/index.vue.eta

@@ -7,39 +7,40 @@
       <template #content>
         <SimpleAppForm :document="userdoc" #default="o">
           <div class="flex flex-col gap-2">
-            <SimpleAppText
+            <SimpleAppInput
+              :input-type="SimpleAppInputType.text"
               autofocus
-              :setting="o.getField('#/properties/fullname')"
-              v-model="userdata.fullname"
+              :setting="o.getField('#/properties/fullName')"
+              v-model="userdata.fullName"
             />
 
-            <SimpleAppText
-              autofocus
-              type="string"
+            <SimpleAppInput
+              :input-type="SimpleAppInputType.text"
+              type="email"
               :setting="o.getField('#/properties/email')"
               v-model="userdata.email"
             />
 
-            <SimpleAppCheckbox
-              autofocus
+            <SimpleAppInput
+            :input-type="SimpleAppInputType.checkbox"
               :setting="o.getField('#/properties/active')"
               v-model="userdata.active"
             />
-            <SimpleAppTextarea
-              autofocus
+            <SimpleAppInput
+            :input-type="SimpleAppInputType.textarea"
               :setting="o.getField('#/properties/description')"
               v-model="userdata.description"
             />
             <div>
               <Button
                 @click="saveUser"
-                class="text-white hover:bg-primary-400 bg-primary-600"
+                class="btn btn-primary"
                 >Save</Button
               >
               <Button
                 v-if="canPerform('user', 'delete')"
                 @click="deleteUser"
-                class="text-white hover:bg-danger-400 bg-danger-600"
+                class="btn btn-danger"
                 >Delete</Button
               >
             </div>
@@ -53,7 +54,7 @@
         <div class="relative w-full ...">
           <h1 class="font-bold">{{ permissiontitle }}</h1>
           <div class="absolute top-0 right-0 h-16 w-16 ...">
-            <ButtonPermissionInfo></ButtonPermissionInfo>
+            <UserButtonPermissionInfo></UserButtonPermissionInfo>
           </div>
         </div>
       </template>
@@ -64,16 +65,14 @@
           </div> -->
 
           <div class="">
-            <Card v-for="o in orglist" class="m-2">
+            <Card
+              v-if="currentpermissions.length > 0"
+              v-for="o in orglist"
+              class="m-2"
+            >
               <template #title>{{ o.orgName }}</template>
               <template #content>
                 <table class="w w-full">
-                  <!-- <thead class="">
-                    <tr>
-                      <th class="text-center font-normal">Branch</th>
-                      <th class="text-left font-normal">Access Right</th>
-                    </tr>
-                  </thead> -->
                   <tr v-for="(b, index) in branchlist">
                     <td v-if="checkBranchInOrg(o, b)" class="text-center">
                       {{ b.branchCode }}
@@ -103,7 +102,8 @@
   </div>
 </template>
 <script setup lang="ts">
-import Card from "primevue/card";
+// import Card from "primevue/card";
+import {SimpleAppInputType} from "~/types"
 import { Permission, User } from "../../../simpleapp/generate/openapi/api";
 import _ from "lodash";
 import SelectButton from "primevue/selectbutton";
@@ -207,7 +207,7 @@ const saveUser = async () => {
 };
 
 const onSelectUser = async (userId: string) => {
-  console.log('onSelectUser',userId)
+  console.log("onSelectUser", userId);
   // .addRoute()
   // const user: UserListItem = { ...menuitem };
   const orgsearchbody: SearchBody = {
@@ -296,7 +296,7 @@ const getPermssionData = (userId: string, branchId: number) => {
 
 onMounted(() => {
   const id = String(useRoute().params.id);
-  console.log("id",id)
+  console.log("id", id);
   onSelectUser(id);
 });
 </script>

package/templates/nuxt/pages/[xorg]/user.vue.eta

@@ -72,7 +72,7 @@ const refreshList = async (resetpage: boolean = true) => {
       "uid",
       "email",
       "created",
-      "fullname",
+      "fullName",
       "active",
       "lastActivity",
       "description",
@@ -111,7 +111,7 @@ const invite = async () => {
   inviteuserdoc.setNew();
   const newuserdata = inviteuserdoc.getReactiveData();
   newuserdata.value.email = inviteemail.value;
-  newuserdata.value.fullname = inviteemail.value.split("@")[0];
+  newuserdata.value.fullName = inviteemail.value.split("@")[0];
   newuserdata.value.active = true;
   newuserdata.value.tenantId = currentuser.tenantId;
   newuserdata.value.orgId = currentuser.orgId;
@@ -126,7 +126,7 @@ const invite = async () => {
 $listen("RefreshUser", () => {
   refreshList();
 });
-onMounted(() => {  
+onMounted(() => {
   refreshList();
 });
 </script>
@@ -161,19 +161,21 @@ onMounted(() => {
         <TabPanel header="Invite">
           <div class="padding p-2">
             <form @submit.prevent="true" class="w-full">
-              <div class="p-inputgroup flex-1">
+              <div class="p-inputgroup flex flex-row ">
                 <InputText
+                class="flex-1"
                   type="email"
                   placeholder="email"
                   v-model="inviteemail"
                 />
-                <Button
-                  label="Search"
-                  class="hover:bg-primary-400 bg-primary-600 text-white"
-                  @click="invite"
-                >
-                  Invite
-                </Button>
+                <div class="p-inputgroup-addon p p-0">
+                  <button label="Search" 
+                  class="border rounded-tl-none rounded-bl-none btn btn-primary -ml-1 h-full  p-3 rounded-r-md"                  
+                  @click="invite">
+                    Invite
+                  </button>
+                </div>
+                
               </div>
             </form>
           </div>

package/templates/nuxt/pages/index.vue._eta

@@ -56,7 +56,7 @@ onMounted(() => {
           something else.
         </p>
         <div class="mt-8 md:flex justify-start md:gap-4">
-          <ButtonCreateTenant></ButtonCreateTenant>
+          <UserButtonCreateTenant></UserButtonCreateTenant>
         </div>
       </div>
       <div class="pt-8 lg:pt-0">
@@ -95,7 +95,7 @@ onMounted(() => {
       </div>
     </div>
     <div  class="grid grid-cols-2">
-      <TenantPicker v-for="tenant in alltenants" :tenant="tenant" class="col col-span-1"></TenantPicker>
+      <UserTenantPicker v-for="tenant in alltenants" :tenant="tenant" class="col col-span-1"></UserTenantPicker>
     </div>
   </div>
 </template>

package/templates/nuxt/plugins/20.simpleapp-userstore.ts.eta

@@ -14,13 +14,16 @@ export default defineNuxtPlugin( async(nuxtApp) => {
 
 
     const useUserStore = defineStore('userstore', {
-        state: ()=>({        
+        state: ()=>({      
+          _id: ref(''),  
           sessionId:ref(''),
           tenantId:ref(0),
           orgId:ref(0),
           branchId:ref(0),
+          branchRecordId:ref(''),
           branchCode:ref(''),
           branchName:ref(''),
+          orgRecordId:ref(''),
           orgCode:ref(''),
           orgName:ref(''),
           uid: ref(''),
@@ -52,10 +55,13 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               if(!res){
                 return
               }
+              this._id = res.data._id
               this.sessionId = res.data.sessionId
               this.tenantId = res.data.tenantId              
               this.orgId = res.data.orgId
+              this.orgRecordId = res.data.orgRecordId
               this.branchId = res.data.branchId
+              this.branchRecordId = res.data.branchRecordId
               this.branchCode = res.data.branchCode
               this.branchName = res.data.branchName
               this.orgCode = res.data.orgCode
@@ -136,10 +142,13 @@ export default defineNuxtPlugin( async(nuxtApp) => {
           },
           getUserInfo(){
             return {
+              _id : this._id,
               sessionId : this.sessionId,
               tenantId : this.tenantId,
               orgId : this.orgId,
               branchId : this.branchId,
+              orgRecordId: this.orgRecordId,
+              branchRecordId: this.branchRecordId,
               uid : this.uid,
               email : this.email,
               branchCode: this.branchCode,

package/templates/nuxt/simpleapp/generate/clients/SimpleAppClient.ts.eta

@@ -186,7 +186,7 @@ export class SimpleAppClient<
   }
   
   hook(type: string, data: TData) {
-    console.log('internal save hook');
+    //console.log('internal save hook');
     return true;
   }
   validateFailed() {