@agung_dhewe/webapps 1.1.2 → 1.2.3

package/src/generator/templates/moduleHeaderEdit.mjs.ejs

@@ -1,13 +1,15 @@
 import Context from './<%= moduleName %>-context.mjs'
-import * as Extender from './<%= moduleName %>-ext.mjs'
-import * as pageHelper from '/public/libs/webmodule/pagehelper.mjs'
+import * as Ext from './<%= moduleName %>-ext.mjs'
+import * as pageHelper from '/public/lib/webmodule/pagehelper.mjs'
+
+const Extender = Ext.extenderHeader ?? Ext
+
 
-const CurrentState = {}
 const Crsl =  Context.Crsl
 const CurrentSectionId = Context.Sections.<%= modulePart %>
 const CurrentSection = Crsl.Items[CurrentSectionId]
 const Source = Context.Source
-
+const CurrentState = {}
 
 const TitleWhenNew = 'New <%= title  %>'
 const TitleWhenView = 'View <%= title  %>'
@@ -23,20 +25,24 @@ const btn_reset = new $fgta5.ActionButton('<%= modulePart %>-btn_reset')
 const btn_prev = new $fgta5.ActionButton('<%= modulePart %>-btn_prev')
 const btn_next = new $fgta5.ActionButton('<%= modulePart %>-btn_next')
 
+<%if (actionList.length>0) {%><% actionList.forEach(action => { %>const <%= action.buttonName %> = new $fgta5.ActionButton('<%= action.elementId %>')
+<% }) %><% } %>
 const btn_recordstatus = document.getElementById('<%= moduleSection %>-btn_recordstatus')
 const btn_logs = document.getElementById('<%= moduleSection %>-btn_logs')
 const btn_about = document.getElementById('<%= moduleSection %>-btn_about')
 
 const frm = new $fgta5.Form('<%= modulePart %>-frm');<% fields.forEach(field => { %>
 const <%= field.inputname %> = frm.Inputs['<%= field.elementId %>']<% }) %>	
-const obj_createby = document.getElementById('fRecord-section-createby')
-const obj_createdate = document.getElementById('fRecord-section-createdate')
-const obj_modifyby = document.getElementById('fRecord-section-modifyby')
-const obj_modifydate = document.getElementById('fRecord-section-modifydate')
+const rec_createby = document.getElementById('fRecord-section-createby')
+const rec_createdate = document.getElementById('fRecord-section-createdate')
+const rec_modifyby = document.getElementById('fRecord-section-modifyby')
+const rec_modifydate = document.getElementById('fRecord-section-modifydate')
+const rec_id = document.getElementById('fRecord-section-id')
 
 
 export const Section = CurrentSection
 
+
 export async function init(self, args) {
 	console.log('initializing <%= modulePart %> ...')
 	
@@ -62,35 +68,73 @@ export async function init(self, args) {
 	btn_logs.addEventListener('click', evt=>{ btn_logs_click(self, evt) })	
 	btn_about.addEventListener('click', evt=>{ btn_about_click(self, evt) })
 
+	// set actions
+	CurrentState.Actions = {
+		newdata: btn_new,
+		edit: btn_edit,<% actionList.forEach(action => { %>
+		<%= action.name %>: <%= action.buttonName %>,<% }) %>	
+	}
+	<% if (!allowFormNew) { %>
+	btn_new.suspend()<% } %><% if (!allowFormEdit) { %>
+	btn_edit.suspend()
+	<% } %>
+	// export async function <%= modulePart %>_init(self, CurrentState)
+	const fn_init_name = '<%= modulePart %>_init'
+	const fn_init = Extender[fn_init_name]
+	if (typeof fn_init === 'function') {
+		await fn_init(self, CurrentState)
+	}
+
+
+	<%if (actionList.length>0) {%>// buat di Extender: export function setupActionButtonEvent(self, frm, CurrentState, buttons) { }
+	const fn_setupactionbuttonevent_name = 'setupActionButtonEvent'
+	const fn_setupactionbuttonevent = Extender[fn_setupactionbuttonevent_name]
+	if (typeof fn_setupactionbuttonevent === 'function') {
+		fn_setupactionbuttonevent(self, frm, CurrentState, {<% actionList.forEach(action => { %>
+			<%= action.buttonName %>,<% }) %>
+		})
+	} else {
+		console.warn('Extender.setupActionButtonEvent is not implemented')
+		console.log('buat function di extender: export function setupActionButtonEvent(self, buttons)')
+	}<% } %>
 
 	<% fieldHandles.forEach(field => { %>
 	// <%= field.component %>: <%= field.inputname %><% field.handles.forEach(hnd => { %>
 	<%= field.inputname %>.addEventListener('<%= hnd.eventname %>', <% if (hnd.eventname=='selecting') { %>async <% } %>(evt)=>{
+		
+		evt.detail.CurrentState = CurrentState
+		
 		const fn_<%= hnd.eventname %>_name = '<%= field.inputname %>_<%= hnd.eventname %>'
 		const fn_<%= hnd.eventname %> = Extender[fn_<%= hnd.eventname %>_name]
 		if (typeof fn_<%= hnd.eventname %> === 'function') {
 			// create function di Extender<% if (field.component=='Combobox' && hnd.eventname=='selecting') { %> (jika perlu)<% } %>:
-			// export async function <%= field.inputname %>_<%= hnd.eventname %>(self, <%= field.inputname %>, frm, evt)
+			// export async function <%= field.inputname %>_<%= hnd.eventname %>(self, <%= field.inputname %>, frm, evt) {}
 			fn_<%= hnd.eventname %>(self, <%= field.inputname %>, frm, evt)
 		} else {<% if (field.component=='Combobox' && hnd.eventname=='selecting') { %>
 			// default selecting
 			const cbo = evt.detail.sender
 			const dialog = evt.detail.dialog
 			const searchtext = evt.detail.searchtext!=null ? evt.detail.searchtext : ''
-			const url = `${Context.appsUrls.<%= hnd.appId %>.url}/<%- hnd.path %>`
+			const url = <% if (hnd.appId=='/') { %>'<%- hnd.path %>'<% } else { %>`${Context.appsUrls.<%= hnd.appId %>.url}/<%- hnd.path %>`<% } %>
+			const sort = {}
 			const criteria = {
 				searchtext: searchtext,
 			}
 
+			evt.detail.url = url 
+			
+			// buat function di extender:
+			// export function <%= field.inputname %>_<%= hnd.eventname %>_criteria(self, <%= field.inputname %>, frm, criteria, sort, evt) {}
 			const fn_<%= hnd.eventname %>_criteria_name = '<%= field.inputname %>_<%= hnd.eventname %>_criteria'
 			const fn_<%= hnd.eventname %>_criteria = Extender[fn_<%= hnd.eventname %>_criteria_name]
 			if (typeof fn_<%= hnd.eventname %>_criteria === 'function') {
-				fn_<%= hnd.eventname %>_criteria(self, <%= field.inputname %>, criteria)
+				fn_<%= hnd.eventname %>_criteria(self, <%= field.inputname %>, frm, criteria, sort, evt)
 			}
 
 			cbo.wait()
 			try {
-				const result = await Module.apiCall(url, {
+				const result = await Module.apiCall(evt.detail.url, {
+					sort,
 					criteria,
 					offset: evt.detail.offset,
 					limit: evt.detail.limit,
@@ -131,6 +175,7 @@ export async function openSelectedData(self, params) {
 
 		CurrentState.currentOpenedId = id
 
+		// export async function <%= modulePart %>_isEditDisabled(self, data)
 		const fn_iseditdisabled_name = '<%= modulePart %>_isEditDisabled'
 		const fn_iseditdisabled = Extender[fn_iseditdisabled_name]
 		if (typeof fn_iseditdisabled === 'function') {
@@ -141,16 +186,21 @@ export async function openSelectedData(self, params) {
 		// disable primary key
 		setPrimaryKeyState(self, {disabled:true})
 
+		// isi form dengan data
 		frm.setData(data)
-		frm.acceptChanges()
-		frm.lock()
 
+		// jika ada kebutuhan untuk oleh lagi form dan data, bisa lakukan di extender
+		// export async function <%= modulePart %>_formOpened(self, frm, CurrentState)
 		const fn_formopened_name = '<%= modulePart %>_formOpened'
 		const fn_formopened = Extender[fn_formopened_name]
 		if (typeof fn_formopened === 'function') {
-			fn_formopened(self, frm, CurrentState)
+			await fn_formopened(self, frm, CurrentState)
 		}
 
+		// finally, accept changes dan lock form
+		frm.acceptChanges()
+		frm.lock()
+
 	} catch (err) {
 		CurrentState.currentOpenedId = null
 		throw err
@@ -170,6 +220,10 @@ export function getForm(self) {
 	return frm
 }
 
+export function getCurrentState(self) {
+	return CurrentState
+}
+
 export function clearForm(self, text) {
 	frm.clear(text)
 }
@@ -289,8 +343,6 @@ async function backToList(self, evt) {
 }
 
 async function  frm_locked(self, evt) {
-	console.log('frm_locked')
-
 	CurrentSection.Title = TitleWhenView
 
 	btn_edit.setText(EditModeText)
@@ -303,8 +355,11 @@ async function  frm_locked(self, evt) {
 	btn_prev.disabled = false
 	btn_next.disabled = false
 
+	<%if (actionList.length>0) {%>// Enable action: action hanya bisa dilakukan saat posisi edit off<% actionList.forEach(action => { %>
+	<%= action.buttonName %>.disabled = false<% }) %><% } %>
 	
 	// Extender untuk event locked
+	// export function <%= modulePart %>_formLocked(self, frm, CurrentState) {}
 	const fn_name = '<%= modulePart %>_formLocked'
 	const fn = Extender[fn_name]
 	if (typeof fn === 'function') {
@@ -325,8 +380,6 @@ async function  frm_locked(self, evt) {
 }
 
 async function  frm_unlocked(self, evt) {
-	console.log('frm_unlocked')
-
 	if (frm.isNew()) {
 		CurrentSection.Title = TitleWhenNew
 	} else {
@@ -343,12 +396,15 @@ async function  frm_unlocked(self, evt) {
 	btn_prev.disabled = true
 	btn_next.disabled = true
 
+	<%if (actionList.length>0) {%>// Disable action: action hanya bisa dilakukan saat posisi edit off<% actionList.forEach(action => { %>
+	<%= action.buttonName %>.disabled = true<% }) %><% } %>
 
 	// Extender untuk event Unlocked
+	// export function <%= modulePart %>_formUnlocked(self, frm, CurrentState) {}
 	const fn_name = '<%= modulePart %>_formUnlocked'
 	const fn = Extender[fn_name]
 	if (typeof fn === 'function') {
-		fn(self, frm)
+		fn(self, frm, CurrentState)
 	}
 
 	<% entitiesDetil.forEach(entity => { %>
@@ -447,9 +503,9 @@ async function btn_new_click(self, evt) {
 	try {
 
 		// inisiasi data baru
-		let datainit = {<% defaultInits.forEach(setdefault => { %>
-			<%- setdefault %>,
-		<% }) %>}
+		const datainit = {<% defaultInits.forEach(setdefault => { %>
+			<%- setdefault %>,<% }) %>
+		}
 
 
 		// jika perlu modifikasi data initial,
@@ -457,6 +513,7 @@ async function btn_new_click(self, evt) {
 		const fn_newdata_name = '<%= modulePart %>_newData'
 		const fn_newdata = Extender[fn_newdata_name]
 		if (typeof fn_newdata === 'function') {
+			// export async function <%= modulePart %>_newData(self, datainit, frm) {}
 			await fn_newdata(self, datainit, frm)
 		}
 
@@ -466,6 +523,10 @@ async function btn_new_click(self, evt) {
 		// buka lock, agar user bisa edit
 		frm.lock(false)
 
+		// jika edit di suspend, enable dulu
+		btn_edit.suspend(false)
+
+
 		// matikan tombol edit dan del saat kondisi form adalah data baru 
 		btn_edit.disabled = true
 		btn_del.disabled = true
@@ -520,12 +581,6 @@ async function btn_save_click(self, evt) {
 		dataToSave = frm.getData()		
 	}
 
-	// Extender Saving
-	const fn_datasaving_name = '<%= modulePart %>_dataSaving'
-	const fn_datasaving = Extender[fn_datasaving_name]
-	if (typeof fn_datasaving === 'function') {
-		await fn_datasaving(self, dataToSave, frm)
-	}
 
 
 	// bila ada file, upload filenya
@@ -537,7 +592,24 @@ async function btn_save_click(self, evt) {
 			const file = files[name]
 			formData.append(name, file)
 		}
-	}	
+	}
+
+
+	// Extender Saving
+	// export async function <%= modulePart %>_dataSaving(self, dataToSave, frm, args) {}
+	const args = { cancelSave: false }
+	const fn_datasaving_name = '<%= modulePart %>_dataSaving'
+	const fn_datasaving = Extender[fn_datasaving_name]
+	if (typeof fn_datasaving === 'function') {
+		await fn_datasaving(self, dataToSave, frm, args)
+	}
+
+	// batalkan save, jika ada request cancel
+	if (args.cancelSave) {
+		console.log('save is canceled')
+		return
+	}
+	
 
 	let mask = $fgta5.Modal.createMask()
 	try {
@@ -580,7 +652,8 @@ async function btn_save_click(self, evt) {
 		const fn_datasaved_name = '<%= modulePart %>_dataSaved'
 		const fn_datasaved = Extender[fn_datasaved_name]
 		if (typeof fn_datasaved === 'function') {
-			await fn_datasaved(self, data, frm)
+			// export async function <%= modulePart %>_dataSaved(self, data, frm) {}
+			await fn_datasaved(self, result, frm)
 		}
 
 
@@ -703,6 +776,12 @@ async function btn_recordstatus_click(self, evt) {
 		sectionReturn: CurrentSection
 	}
 	
+	if (frm.isNew()) {
+		console.warn('tidak bisa buka rescord status jika data baru')	
+		$fgta5.MessageBox.warning('Record Status bisa dibuka setelah data disimpan')
+		return;
+	}
+
 	pageHelper.openSection(self, 'fRecord-section', params, async ()=>{
 
 		let mask = $fgta5.Modal.createMask()
@@ -712,10 +791,11 @@ async function btn_recordstatus_click(self, evt) {
 			const id = pk.value
 			const data = await openData(self, id)
 
-			obj_createby.innerHTML = data._createby
-			obj_createdate.innerHTML = data._createdate
-			obj_modifyby.innerHTML = data._modifyby
-			obj_modifydate.innerHTML = data._modifydate
+			rec_id.innerHTML = id
+			rec_createby.innerHTML = data._createby
+			rec_createdate.innerHTML = data._createdate
+			rec_modifyby.innerHTML = data._modifyby
+			rec_modifydate.innerHTML = data._modifydate
 
 			const fn_addrecordinfo_name = '<%= modulePart %>_addRecordInfo'
 			const fn_addrecordinfo = Extender[fn_addrecordinfo_name]
@@ -740,6 +820,12 @@ async function btn_logs_click(self, evt) {
 		sectionReturn: CurrentSection
 	}
 
+	if (frm.isNew()) {
+		console.warn('tidak bisa buka logs jika data baru')	
+		$fgta5.MessageBox.warning('Logs bisa dibuka setelah data disimpan')
+		return;
+	}
+
 	pageHelper.openSection(self, 'fLogs-section', params, async ()=>{
 		// get log data
 		const pk = frm.getPrimaryInput()
@@ -749,7 +835,8 @@ async function btn_logs_click(self, evt) {
 		let mask = $fgta5.Modal.createMask()
 		try {
 
-			const url = `${Context.appsUrls.core.url}/logs/list`
+			const logApp = Context.appsUrls.core ?? Context.appsUrls[Context.appName]
+			const url = `${logApp.url}/logs/list`
 			const criteria = {
 				module: Context.moduleName,
 				table: '<%= tablename %>',

package/src/generator/templates/moduleHeaderList.html.ejs

@@ -1,3 +1,6 @@
+<div id="<%= modulePart %>-header">
+</div>
+
 <div class="search-container">
 	<div id="<%= modulePart %>-pnl_search" class="search-parameters">
 		<input id="<%= modulePart %>-txt_searchtext" fgta5-component="Textbox" placeholder="search" autocomplete="off" spellcheck="false" binding="searchtext" data-searchinput>
@@ -13,7 +16,8 @@
 	</thead>
 </table>
 
-
+<div id="<%= modulePart %>-foot">
+</div>
 
 <div class="footer-buttons-container">
 	<div></div>

package/src/generator/templates/moduleHeaderList.mjs.ejs

@@ -1,6 +1,7 @@
 import Context from './<%= moduleName %>-context.mjs'
-import * as Extender from './<%= moduleName %>-ext.mjs'
+import * as Ext from './<%= moduleName %>-ext.mjs'
 
+const Extender = Ext.extenderHeader ?? Ext
 
 const Crsl =  Context.Crsl
 const CurrentSectionId = Context.Sections.<%= modulePart %>
@@ -41,7 +42,7 @@ export async function init(self, args) {
 
 	try {
 		// extract custom search panel from template
-		const tplSearchPanel = document.querySelector('template[name="custom-search-panel"]')
+		const tplSearchPanel = document.getElementById('tpl-custom-search-panel')
 		if (tplSearchPanel!=null) {
 			const clone = tplSearchPanel.content.cloneNode(true); // salin isi template
 			pnl_search.prepend(clone)
@@ -94,6 +95,9 @@ export async function loadData(self) {
 	tbl_loadData(self)
 }
 
+export function getCurrentState(self) {
+	return CurrentState
+}
 
 export function getGrid(self) {
 	return tbl
@@ -164,9 +168,12 @@ export function keyboardAction(self, actionName, evt) {
 		tbl.nextRecord()
 	} else if (actionName=='enter') {
 		const <%= moduleEdit %> = self.Modules.<%= moduleEdit %>
-		<%= moduleEdit %>.Section.show({}, ()=>{
-			openRow(self, tbl.CurrentRow)
-		})		
+		if (tbl.CurrentRow!=null) {
+			<%= moduleEdit %>.Section.show({}, ()=>{
+				openRow(self, tbl.CurrentRow)
+			})
+		}	
+		
 	} else if (actionName=='typing') {
 		evt.preventDefault();
 		evt.stopPropagation();
@@ -187,9 +194,14 @@ export function keyboardAction(self, actionName, evt) {
 
 function setCurrentRow(self, tr) {
 	CurrentState.SelectedRow = tr
+	tbl.CurrentRow = tr
 }
 
 async function openRow(self, tr) {
+	if (tr==null) {
+		return
+	}
+
 	const keyvalue = tr.getAttribute('keyvalue')
 	const key = tr.getAttribute('key')
 
@@ -201,28 +213,40 @@ async function openRow(self, tr) {
 		CurrentState.SelectedRow.keyValue = keyvalue
 		CurrentState.SelectedRow.key = key
 		await <%= moduleEdit %>.openSelectedData(self, {key:key, keyvalue:keyvalue})
-	} catch (err) {
-		console.error(err)
-		await $fgta5.MessageBox.error(err.message)
 
+		// matikan atau nyalakan button prev/next sesuai kondisi
+		setPagingButton(self, <%= moduleEdit %>)
+
+	} catch (err) {
 		setCurrentRow(self, null)
 		CurrentSection.show() // kembalikan ke list kalau error saat buka data
-	}
-
 
-	// matikan atau nyalakan button prev/next sesuai kondisi
-	setPagingButton(self, <%= moduleEdit %>)
+		console.error(err)
+		await $fgta5.MessageBox.error(err.message)
+	}
+	
 }
 
-async function listRows(self, criteria, offset,limit, sort) {
+async function listRows(self, criteria, offset, limit, sort) {
+
 	const url = `/${Context.moduleName}/header-list`
+	const evt = { url, limit }
+
+	// export function headerList_dataLoad(self, criteria, sort, evt) {}
+	const fn_dataLoad_name = 'headerList_dataLoad'
+	const fn_dataLoad = Extender[fn_dataLoad_name]
+	if (typeof fn_dataLoad === 'function') {
+		fn_dataLoad(self, criteria, sort, evt)
+	}
+
+	
 	try {
 		const columns = []
-		const result = await Module.apiCall(url, {  
+		const result = await Module.apiCall(evt.url, {  
 			columns,
 			criteria,
 			offset,
-			limit,
+			limit: evt.limit,
 			sort
 		}) 
 		return result 
@@ -292,6 +316,14 @@ async function tbl_loadData(self, params={}) {
 		}
 		tbl.addRows(result.data)
 		tbl.setNext(result.nextoffset, result.limit)
+
+		// export function headerList_tableDataLoaded(self, tbl, result) {}
+		const fn_name = 'headerList_tableDataLoaded'
+		const fn = Extender[fn_name]
+		if (typeof fn === 'function') {
+			fn(self, tbl, result)
+		}
+
 	} catch (err) {
 		console.error(err)
 		$fgta5.MessageBox.error(err.message)

package/src/generator/trygenerate.js

@@ -1,5 +1,7 @@
 import dotenv from 'dotenv'
 import { Worker } from 'worker_threads'
+import * as path from 'node:path';
+import { fileURLToPath } from 'node:url';
 
 dotenv.config()
 
@@ -9,6 +11,9 @@ console.log('Testing Generator')
 
 const args = process.argv.slice(2)
 const generator_id = args[0]
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
 
 if (generator_id==null) {
 	console.log("\n\n\x1b[1m\x1b[31mERROR\x1b[0m")
@@ -19,6 +24,14 @@ if (generator_id==null) {
 
 const workerTimeoutMs = 1*60*1000
 
+const ModuleDbContract = {
+	apps: {
+		table: 'core."apps"'
+	},
+	generator: {
+		table: 'core.generator'
+	}
+}
 
 await main(generator_id)
 
@@ -26,14 +39,17 @@ await main(generator_id)
 async function main(generator_id) {
 	console.log(`Start to generate program id:'${generator_id}'`)
 
+
+
 	try {
-		const workerPath = './src/generator/worker.js'
+		const workerPath = path.join(__dirname, 'worker.js')
 		const worker = new Worker(workerPath, {
 			workerData: {
 				generator_id,
 				user_id: 1,
 				user_name: 'coredeveloper',
-				ipaddress: 'local-cli'
+				ipaddress: 'local-cli',
+				ModuleDbContract: ModuleDbContract,
 			}
 		}, workerTimeoutMs)