@simitgroup/simpleapp-generator 1.6.1-alpha → 1.6.2-alpha

package/README.md

@@ -104,7 +104,7 @@ simpleapp-generator -g init
 
 5. prepare backend
 ```sh
-sh build.sh backend
+bash build.sh backend
 ```
 6. update backend configurations file by modify `~/project1/backend/.env`, change mongodb, keycloak settings according your requirements
 7. start backend:
@@ -118,6 +118,13 @@ pnpm start:dev
 sh build.sh frontend
 ```
 9. modify frontend configuration by modify `~/project1/frontend/.env`, change keycloak settings
+```sh
+OAUTH2_BASEURL=https://server-url    #keycloak server url
+OAUTH2_CONFIGURL=https://server-url/realms/testing
+OAUTH2_CLIENTID=client1
+OAUTH2_CLIENTSECRET=aaaa-xxxxx-yyyy-zzzzz-www
+ADMIN_EMAIL=your@ykeycloakemail.com    #if you have multiple, separate by ','
+```
 10. start frontend:
 ```sh
 cd ~/project1/frontend

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "1.6.1-alpha",
+  "version": "1.6.2-alpha",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {

package/templates/nest/src/simpleapp/services/userresolver.service.ts._eta

@@ -1,6 +1,5 @@
 /**
  * This file was automatically generated by simpleapp generator. It is changable
- * --remove-this-line-to-prevent-override--
  * last change 2024-04-24
  * Author: Ks Tan
  */
@@ -9,32 +8,30 @@ import { Injectable } from '@nestjs/common';
 import { SimpleAppRobotUserService } from '../generate/commons/robotuser.service';
 import { UserContext } from '../generate/commons/user.context';
 import { UserService } from './user.service';
-import { TeacherService } from './teacher.service';
-
+// import { TeacherService } from './teacher.service';
 
 @Injectable()
 export class UserResolverService {
   constructor(
     private userService: UserService,
-    private teacherService: TeacherService,
+    // private teacherService: TeacherService,
     private robotUserService: SimpleAppRobotUserService,
   ) {}
-  async teacher(assignvalue: string, data: any) {
-    console.log('assign value for teacher', assignvalue);
-
-    const appuser = this.robotUserService.prepareAppUser(data);
-    console.log('gettenant', appuser.getBranchFilter());
-    return this.resolve(appuser, 'teacher', assignvalue, data);
-  }
+  // async teacher(assignvalue: string, data: any) {
+    // console.log('assign value for teacher', assignvalue);
+    // const appuser = this.robotUserService.prepareAppUser(data);
+    // console.log('gettenant', appuser.getBranchFilter());
+    // return this.resolve(appuser, 'teacher', assignvalue, data);
+  // }
   async resolve(appuser: UserContext, usertype: string, id: string, data: any) {
     let result = '';
     switch (usertype) {
       case 'user':
         result = await this.resolveUser(appuser, id, data);
         break;
-      case 'teacher':
-        result = await this.resolveTeacher(appuser, id, data);
-        break;
+      // case 'teacher':
+      //   result = await this.resolveTeacher(appuser, id, data);
+      //   break;
 
       case 'group':
         // result = await this.resolveTeacher(appuser,id,data)
@@ -51,17 +48,17 @@ export class UserResolverService {
     if (user && user.length > 0) return user[0].uid;
     else return undefined;
   }
-  async resolveTeacher(
-    appuser: UserContext,
-    id: string | undefined,
-    data: any,
-  ) {
-    if (!id) return undefined;
-    console.log('Find teacher::', id);
-    const teacher = await this.teacherService.findById(appuser, id);
-    console.log('teacher', teacher);
-    return this.getUser(appuser, teacher.email);
-  }
+  // async resolveTeacher(
+  //   appuser: UserContext,
+  //   id: string | undefined,
+  //   data: any,
+  // ) {
+  //   if (!id) return undefined;
+  //   console.log('Find teacher::', id);
+  //   const teacher = await this.teacherService.findById(appuser, id);
+  //   console.log('teacher', teacher);
+  //   return this.getUser(appuser, teacher.email);
+  // }
 
   async resolveUser(appuser: UserContext, id: string | undefined, data: any) {
     const user = await this.userService.findById(appuser, id);

package/templates/nuxt/components/calendar/CalendarInput.vue.eta

@@ -0,0 +1,24 @@
+<template>
+    <div class="flex flex-col ">
+      <label v-if="label" :for="inputid">{{ label }}</label>
+      <Calendar 
+        v-model="modelValue" 
+        class="w-full" 
+        :inputid="inputid"
+        :date-format="getPrimevueCalendarDateFormat()"
+        />
+    </div>
+</template>
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp generator during initialization.
+ * IT IS NOT CHANGABLE
+ * last change 2024-04-16
+ * author: Ks Tan
+ */
+const modelValue = defineModel<Date>({required:true})
+const inputid=randomUUID()
+const props = defineProps<{
+    label?:string
+}>()
+</script>

package/templates/nuxt/components/list/ListView.vue.eta

@@ -1,21 +1,29 @@
 <template>
   <div class="relative">
-    <div v-if="withFilter" class="flex flex-row">
-      <InputText
-        :placeholder="t('searchKeyword')"
-        v-model="searchvalue"
-        class="w-full dark:text-white"
-        type="search"
-        ref="listviewfilter"
-      />
-      <template v-if="withAddNew">
-        <ButtonText v-if="isMobile()" @click="emits('add')"
-          ><i class="pi pi-plus"></i
-        ></ButtonText>
-        <ButtonPrimary v-else @click="emits('add')"
-          ><i class="pi pi-plus"></i
-        ></ButtonPrimary>
-      </template>
+    <div v-if="withFilter" class="flex flex-row p-2">
+      <InputGroup>
+          <InputGroupAddon v-if="filter">
+
+             <ButtonDefault @click="showMoreFilter" v-if="Object.keys(filter)==0">
+              <i class="pi pi-filter"></i>
+            </ButtonDefault>
+            <ButtonWarning @click="showMoreFilter" v-else>
+              <i class="pi pi-filter"></i>
+            </ButtonWarning>
+          </InputGroupAddon>
+          <InputText
+              :placeholder="t('searchKeyword')"
+              v-model="searchvalue"
+              class="w-full dark:text-white text-sm "
+              type="search"
+              ref="listviewfilter"
+            />
+          <InputGroupAddon v-if="withAddNew">            
+            <ButtonPrimary @click="emits('add')">
+              <i class="pi pi-plus"></i>
+            </ButtonPrimary>
+          </InputGroupAddon>
+      </InputGroup>
     </div>
 
     <div
@@ -51,7 +59,10 @@
               index > 0 ? 'border-t-2' : ''
             }`"
           >
-            <NuxtLink :to="getUrl(item)" :class="`p-2 ${showClickEffect ? 'listlink' :''}`">
+            <NuxtLink
+              :to="getUrl(item)"
+              :class="`p-2 ${showClickEffect ? 'listlink' : ''}`"
+            >
               <slot name="default" :item="item" :index="index">
                 <div class="flex flex-row">
                   <div class="flex-1 mr-2 dark:text-white">
@@ -76,6 +87,23 @@
         </slot>
       </div>
     </div>
+
+
+    <Dialog v-model:visible="visibleMoreFilter" :header="t('filter')">
+      <slot name="filter">
+        define filter in #filter
+      </slot>
+      <template #footer>
+        <div class="flex flex-row">
+          <ButtonDefault @click="clearFilter" class="flex flex-row p-2">
+            <i class="pi pi-times mr-1"/> <span class="mr-1">{{t('clear')}}</span>
+          </ButtonDefault>
+          <ButtonPrimary  @click="runFilter" class="flex flex-row p-2">
+            <i class="pi pi-filter mr-1"/> <span class="mr-1">{{t('ok')}}</span>
+          </ButtonPrimary>
+        </div>
+      </template>
+    </Dialog>
   </div>
 </template>
 <script setup lang="ts" generic="T extends { [key: string]: any }">
@@ -88,6 +116,7 @@
 import { ref } from "vue";
 import { ListItem } from "~/types/listview";
 import _ from "lodash";
+const visibleMoreFilter = ref(false)
 const listviewfilter = ref();
 const props = withDefaults(
   defineProps<{
@@ -97,9 +126,10 @@ const props = withDefaults(
     idField?: string;
     subTitleField?: string;
     withFilter?: boolean;
+    filter?:Object;
     withAddNew?: boolean;
     showIndex?: boolean;
-    showClickEffect?:boolean
+    showClickEffect?: boolean;
   }>(),
   {
     idField: "_id",
@@ -108,7 +138,7 @@ const props = withDefaults(
 const letters = ref<string[]>([]);
 let lastchar = "";
 
-const emits = defineEmits(["add", "click"]);
+const emits = defineEmits(["add", "runFilter", "clearFilter","click"]);
 const searchvalue = ref("");
 const selecteditem = ref("");
 const clickRow = (item: ListItem) => {
@@ -172,6 +202,17 @@ const onClick = (index: number, data: T) => {
   emits("click", index, data);
 };
 
+const showMoreFilter = ()=>{
+  visibleMoreFilter.value=true
+}
+const clearFilter = () =>{  
+  visibleMoreFilter.value = false
+  emits('clearFilter')
+}
+const runFilter = () => {
+  visibleMoreFilter.value = false
+  emits('runFilter')
+}
 onMounted(() => {
   // if(props.withFilter) listviewfilter.value.$el.focus()
 });

package/templates/nuxt/composables/date.generate.ts.eta

@@ -21,6 +21,7 @@ export const dateToISOString = (date:Date) => useDayjs()(date).toISOString()
 export const dateToTimeString = (date:Date) => useDayjs()(date).format('HH:mm:ss')
 export const stringToDate = (datestr:string) => new Date(datestr)
 export const dateToDateTimeString = (date:Date)=> useDayjs().utc(date).format('YYYY-MM-DD HH:mm:ss')
+export const toLocalDate = (date:string | Date)=> useDayjs().utc(date).format(getDateFormat())
 export const toUTCDate = (date:string | Date)=> useDayjs().utc(date).format(getDateFormat())
 export const toUTCDateTime = (date:string | Date)=> useDayjs().utc(date).format(getDateTimeFormat())
 export const toUTCTime = (date:string | Date)=> useDayjs().utc(date).format('HH:mm')

package/templates/project/jsonschemas/invoice.json._eta

@@ -8,18 +8,26 @@
     "documentTitle": "invoiceTitle",
     "documentDate": "invoiceDate",
     "generateDocumentNumber": true,
-    "pageType": "crud",    
+    "pageType": "crud",
     "formulas": [
-      { "jsonPath": "$.details[*]", "formula": "sharelibs.getSubtotal(value)" },
+      { "jsonPath": "$.details[*]", "formula": "sharelibs.getSubtotal($item)" },
       {
         "jsonPath": "$.invoiceTotal",
-        "formula": "sharelibs.getTotal(data.details)"
+        "formula": "sharelibs.getTotal($data.details)"
       }
     ],
-    "printFormats":[
-      {"formatName":"invoice A4","formatId":"invoice-a4","description":""},
-      {"formatName":"invoice A5","formatId":"invoice-a5","description":""}
-    ],
+    "printFormats": [
+      {
+        "formatName": "invoice A4",
+        "formatId": "invoice-a4",
+        "description": ""
+      },
+      {
+        "formatName": "invoice A5",
+        "formatId": "invoice-a5",
+        "description": ""
+      }
+    ]
   },
   "properties": {
     "_id": { "type": "string" },