@agung_dhewe/webapps 1.1.2 → 1.2.1

package/src/generator/createModuleDetilEditMjs.js

@@ -8,9 +8,9 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export async function createModuleDetilEditMjs(context, options) {
-	const overwrite = options.overwrite===true
+	const overwrite = options.overwrite === true
 	const moduleName = context.moduleName
-	const title = context.title
+	// const title = context.title // ini title header
 	const sectionPart = 'edit'
 
 	try {
@@ -24,23 +24,25 @@ export async function createModuleDetilEditMjs(context, options) {
 			const entityData = context.entities[entityName]
 
 			// process selain header
-			if (entityName=='header') {
+			if (entityName == 'header') {
 				continue
 			}
 
+			const title = entityData.title
 			const sectionName = entityName
+			const extenderDetil = kebabToCamel(`extender-${sectionName}`)
 			const modulePart = kebabToCamel(`${moduleName}-${sectionName}-${sectionPart}`)
 			const targetFile = path.join(context.moduleDir, `${modulePart}.mjs`)
 
 			// cek dulu apakah file ada
 			var fileExists = await isFileExist(targetFile)
 			if (fileExists && !overwrite) {
-				context.postMessage({message: `skip file: '${targetFile}`})
+				context.postMessage({ message: `skip file: '${targetFile}` })
 				return
 			}
 
 			// reporting progress to parent process
-			context.postMessage({message: `generating file: '${targetFile}`})
+			context.postMessage({ message: `generating file: '${targetFile}` })
 
 
 			const tablename = entityData.table
@@ -65,60 +67,60 @@ export async function createModuleDetilEditMjs(context, options) {
 				const elementId = `${modulePart}-${item.input_name}`
 
 
-				if (component=='Filebox') {
+				if (component == 'Filebox') {
 					detilHasUpload = true
 					uploadFields.push({
 						elementId,
 						fieldname,
 						inputname
 					})
-				} else if (component=='Combobox') {
+				} else if (component == 'Combobox') {
 					comboboxList.push({
 						inputname
 					})
-				}				
+				}
 
 				// setup handles
 				const handles = []
 				for (let eventname in item.Handle) {
 					let createhandle = item.Handle[eventname]
 					if (createhandle) {
-						if (eventname=='selecting' && component=='Combobox') {
+						if (eventname == 'selecting' && component == 'Combobox') {
 							handles.push({
 								eventname,
 								appId: item.Reference.loaderApiModule,
 								path: item.Reference.loaderApiPath,
 								field_value: item.Reference.bindingValue,
-								field_text: item.Reference.bindingText, 
+								field_text: item.Reference.bindingText,
 							})
 						} else {
-							handles.push({eventname})
+							handles.push({ eventname })
 						}
 					}
 				}
 
-				if (handles.length>0) {
-					fieldHandles.push({component, inputname, handles})
+				if (handles.length > 0) {
+					fieldHandles.push({ component, inputname, handles })
 				}
 
 
 				// setup default values
 				let setdefault
 				if (item.data_defaultvalue != '') {
-					if (item.component=='Datepicker' || item.component=='Timepicker') {
-						setdefault = `${item.name }: new Date()`
-					} else if (item.component=='Numberbox') {
-						setdefault = `${item.name }: ${item.data_defaultvalue}`
-					} else if (item.component=='Checkbox') {
-						if (item.data_defaultvalue==='true' || item.data_defaultvalue==='checked' || item.data_defaultvalue==='1') {
-							setdefault = `${item.name }: true`
+					if (item.component == 'Datepicker' || item.component == 'Timepicker') {
+						setdefault = `${item.name}: new Date()`
+					} else if (item.component == 'Numberbox') {
+						setdefault = `${item.name}: ${item.data_defaultvalue}`
+					} else if (item.component == 'Checkbox') {
+						if (item.data_defaultvalue === 'true' || item.data_defaultvalue === 'checked' || item.data_defaultvalue === '1') {
+							setdefault = `${item.name}: true`
 						}
 					} else {
-						setdefault = `${item.name }: '${item.data_defaultvalue}'`
+						setdefault = `${item.name}: '${item.data_defaultvalue}'`
 					}
 				}
 
-				if (setdefault!=null) {
+				if (setdefault != null) {
 					defaultInits.push(setdefault)
 				}
 
@@ -127,15 +129,15 @@ export async function createModuleDetilEditMjs(context, options) {
 
 
 				// add to field config data	
-				fields.push({  
+				fields.push({
 					component,
 					fieldname,
 					inputname,
 					elementId
 				})
-			}	
-			
-			
+			}
+
+
 			const detilPrimaryKey = entityData.pk
 
 
@@ -146,10 +148,12 @@ export async function createModuleDetilEditMjs(context, options) {
 				modulePart,
 				moduleName,
 				sectionName,
+				extenderDetil,
+				headerModulePartEdit,
 				entityName,
 				headerPrimaryKey,
 				detilPrimaryKey,
-				moduleSection:  kebabToCamel(`${moduleName}-${sectionName}`),
+				moduleSection: kebabToCamel(`${moduleName}-${sectionName}`),
 				moduleList: kebabToCamel(`${moduleName}-${sectionName}-list`),
 				fields,
 				fieldHandles,
@@ -162,7 +166,7 @@ export async function createModuleDetilEditMjs(context, options) {
 			const tplFilePath = path.join(__dirname, 'templates', 'moduleDetilEdit.mjs.ejs')
 			const template = await fs.readFile(tplFilePath, 'utf-8');
 			const content = ejs.render(template, variables)
-					
+
 			await fs.writeFile(targetFile, content, 'utf8');
 		}
 	} catch (err) {

package/src/generator/createModuleDetilListHtml.js

@@ -15,6 +15,8 @@ export async function createModuleDetilListHtml(context, options) {
 	
 
 	try {
+
+		const entityHeader = context.entities['header']
 		
 		for (let entityName in context.entities) {
 			// process selain header
@@ -110,14 +112,19 @@ export async function createModuleDetilListHtml(context, options) {
 				}
 
 
+				const addToFields = fieldName!=entityHeader.pk
+
 				// masukkan ke fields
-				fields.push({  
-					component,
-					dataName: columnDataName, //bindingDisplay!=null ? bindingDisplay : dataName, 
-					binding: columnDataBinding, //bindingDisplay!=null ? bindingDisplay : binding,
-					label,
-					additionalAttributes
-				})
+				if (addToFields) {
+					fields.push({  
+						component,
+						dataName: columnDataName, //bindingDisplay!=null ? bindingDisplay : dataName, 
+						binding: columnDataBinding, //bindingDisplay!=null ? bindingDisplay : binding,
+						label,
+						additionalAttributes
+					})
+				}
+				
 			}
 
 

package/src/generator/createModuleDetilListMjs.js

@@ -19,6 +19,8 @@ export async function createModuleDetilListMjs(context, options) {
 		const headerEntityData = context.entities['header']
 		const headerModulePartEdit = kebabToCamel(`${moduleName}-header-edit`)
 		const headerPrimaryKey = headerEntityData.pk
+		const bindHeadTitle = headerEntityData.bindHeadTitle ?? ''
+		const bindHeadDescr = headerEntityData.bindHeadDescr ?? ''
 
 		for (let entityName in context.entities) {
 			// process selain header
@@ -27,6 +29,7 @@ export async function createModuleDetilListMjs(context, options) {
 			}
 
 			const sectionName = entityName
+			const extenderDetil = kebabToCamel(`extender-${sectionName}`)
 			const modulePart = kebabToCamel(`${moduleName}-${sectionName}-${sectionPart}`)
 			const targetFile = path.join(context.moduleDir, `${modulePart}.mjs`)
 				
@@ -46,7 +49,10 @@ export async function createModuleDetilListMjs(context, options) {
 			const entityData = context.entities[entityName]
 			const sectionData = getSectionData(moduleName, entityName, entityData, 'edit')
 			const title = entityData.title
-
+			const allowRowAdd = entityData.allowRowAdd
+			const allowRowRemove = entityData.allowRowRemove
+			const allowRowEdit = entityData.allowRowEdit
+			
 
 			const variables = {
 				timeGenerated: context.timeGenerated,
@@ -54,8 +60,14 @@ export async function createModuleDetilListMjs(context, options) {
 				modulePart,
 				moduleName,
 				sectionName,
+				extenderDetil,
 				headerModulePartEdit,
 				headerPrimaryKey,
+				bindHeadTitle,
+				bindHeadDescr,
+				allowRowAdd,
+				allowRowRemove,
+				allowRowEdit,
 				moduleEdit: kebabToCamel(`${moduleName}-${sectionName}-edit`),
 
 			}

package/src/generator/createModuleHeaderEditHtml.js

@@ -10,6 +10,7 @@ const __dirname = path.dirname(__filename);
 export async function createModuleHeaderEditHtml(context, options) {
 	const overwrite = options.overwrite===true
 	const moduleName = context.moduleName
+	const actions = context.actions
 	const title = context.title
 	const sectionPart = 'edit'
 
@@ -114,11 +115,21 @@ export async function createModuleHeaderEditHtml(context, options) {
 				const title = entityData.title
 				sectionDetils.push({
 					listModulePart,
-					title
+					title,
+					entityName: detilEntityName
 				})
 			}
 
 
+			// ambil data actions
+			const actionList = []
+			for (let action of context.actions) {
+				const namepart = kebabToCamel(`btn_action-${action.name}`)
+				const elid = `${modulePart}-${namepart}`
+				action.elementId = elid
+				actionList.push(action)
+			}
+
 			const variables = {
 				timeGenerated: context.timeGenerated,
 				title: title,
@@ -130,6 +141,7 @@ export async function createModuleHeaderEditHtml(context, options) {
 				primaryKeyElementId: primaryKeyElementId,
 				fields: fields,
 				sectionDetils: sectionDetils,
+				actionList,
 				detilCount
 			}
 			

package/src/generator/createModuleHeaderEditMjs.js

@@ -10,12 +10,17 @@ const __dirname = path.dirname(__filename);
 export async function createModuleHeaderEditMjs(context, options) {
 	const overwrite = options.overwrite===true
 	const moduleName = context.moduleName
-	const title = context.title
+	
+	const actions = context.actions
 	const sectionPart = 'edit'
 	const timeGenerated = context.timeGenerated
 
 	try {
 
+
+		const headerEntityData = context.entities['header']
+		const title = headerEntityData.title
+
 		// Data Detil
 		const entitiesDetil = []
 		for (let entityName in context.entities) {
@@ -86,6 +91,7 @@ export async function createModuleHeaderEditMjs(context, options) {
 				const elementId = `${modulePart}-${item.input_name}`
 
 
+
 				if (component=='Filebox') {
 					headerHasUpload = true
 					uploadFields.push({
@@ -158,7 +164,19 @@ export async function createModuleHeaderEditMjs(context, options) {
 			}
 
 		
+			// ambil data actions
+			const actionList = []
+			for (let action of context.actions) {
+				const buttonName = kebabToCamel(`btn_action-${action.name}`)
+				const elid = `${modulePart}-${buttonName}`
+				action.buttonName = buttonName
+				action.elementId = elid
+				actionList.push(action)
+			}
+
 
+			const allowFormNew = entityData.allowFormNew
+			const allowFormEdit = entityData.allowFormEdit
 
 
 			const variables = {
@@ -166,6 +184,8 @@ export async function createModuleHeaderEditMjs(context, options) {
 				moduleDescription: context.descr,
 				title,
 				tablename,
+				allowFormNew,
+				allowFormEdit,
 				modulePart,
 				moduleName,
 				moduleSection:  kebabToCamel(`${moduleName}-${sectionName}`),
@@ -177,7 +197,8 @@ export async function createModuleHeaderEditMjs(context, options) {
 				headerHasUpload,
 				entitiesDetil,
 				uploadFields,
-				comboboxList
+				comboboxList,
+				actionList
 			}
 
 			

package/src/generator/createProgramData.js

@@ -64,8 +64,9 @@ export async function createProgramData(context, options) {
 			if (row==null) {
 				// insert
 				const sequencer = createSequencerLine(tx, {})
-				const program_id = await sequencer.yearlyshort('CNT')
-				
+				const seqdata = await sequencer.yearlyshort('PROG')
+				const program_id = seqdata.id
+
 				obj.program_id = program_id
 				obj._createby =  user_id
 				obj._createdate =  (new Date()).toISOString()

package/src/generator/createTable.js

@@ -11,18 +11,21 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export async function createTable(context, options) {
-	const skipGenerate = options.skipGenerate===true
+	const skipGenerate = options.skipGenerate === true
 	const moduleName = context.moduleName
 	const title = context.title
-	
-	
+
+
 
 	try {
 		if (skipGenerate) {
-			context.postMessage({message: `skip generate table(s)`})
+			context.postMessage({ message: `skip generate table(s)` })
 			return
 		}
 
+		console.log(context.entities)
+
+
 
 		// start geneate program code		
 		let sections = []
@@ -30,19 +33,23 @@ export async function createTable(context, options) {
 
 			// prepare target file
 			const targetFile = path.join(context.moduleDir, `${moduleName}-${entityName}.sql`)
-			
-			
+
+
 			// reporting progress to parent process
-			context.postMessage({message: `generating file: '${targetFile}`})
+			context.postMessage({ message: `generating file: '${targetFile}` })
 
 
 			// start generate table for tis entity
 			const entity = context.entities[entityName]
-			const {table, descr, pk, identifierMethod} = entity
+			const { table, descr, pk, identifierMethod, skipRegenerateTable } = entity
 			const pkData = entity.Items[pk]
-			const {schema, tablename} = ddl.parseTableName(table)
-			const {data_fieldname, data_type, data_length, description} = pkData
-			
+			const { schema, tablename } = ddl.parseTableName(table)
+			const { data_fieldname, data_type, data_length, description } = pkData
+
+
+			if (skipRegenerateTable === true) {
+				continue
+			}
 
 
 			const scriptContent = []
@@ -52,7 +59,7 @@ export async function createTable(context, options) {
 
 			// Buat Table dengan field hanya untuk primary key
 			{
-				const sql =	await ddl.createTable(schema, tablename, descr, {
+				const sql = await ddl.createTable(schema, tablename, descr, {
 					fieldname: data_fieldname,
 					datatype: data_type,
 					length: data_length,
@@ -62,31 +69,31 @@ export async function createTable(context, options) {
 			}
 
 			const recordColumns = createRecordColumns()
-			const entityItems = structuredClone({...entity.Items, ...recordColumns})
+			const entityItems = structuredClone({ ...entity.Items, ...recordColumns })
 
 			// Buat Fields
 			{
-				
+
 				for (var fieldname in entityItems) {
-					if (fieldname==pk) {
+					if (fieldname == pk) {
 						continue
 					}
 
 					const field = entityItems[fieldname]
-					const {data_fieldname, data_type, data_length, data_precision, data_allownull, data_defaultvalue, description} = field
-
-					const sql =	await ddl.createField(schema, tablename, {
-						fieldname: data_fieldname, 
-						datatype: data_type, 
-						length: data_length, 
-						precision: data_precision, 
-						allownull: data_allownull, 
-						defaultvalue: data_defaultvalue, 
+					const { data_fieldname, data_type, data_length, data_precision, data_allownull, data_defaultvalue, description } = field
+
+					const sql = await ddl.createField(schema, tablename, {
+						fieldname: data_fieldname,
+						datatype: data_type,
+						length: data_length,
+						precision: data_precision,
+						allownull: data_allownull,
+						defaultvalue: data_defaultvalue,
 						description: description
 					})
 					scriptContent.push(sql)
 				}
-			
+
 			}
 
 			// buat foreign key
@@ -99,8 +106,8 @@ export async function createTable(context, options) {
 						return acc;
 					}, {})
 
-				
-				const sql =	await ddl.createFereignKey(schema, tablename, foreignKeys)	
+
+				const sql = await ddl.createFereignKey(schema, tablename, foreignKeys)
 				scriptContent.push(sql)
 
 			}
@@ -112,9 +119,9 @@ export async function createTable(context, options) {
 			{
 				const sql = await ddl.createUniqueIndex(schema, tablename, entity.Uniques)
 				scriptContent.push(sql)
-			}	
+			}
+
 
-			
 			let content = scriptContent.join("\n")
 			await fs.writeFile(targetFile, content, 'utf8');
 
@@ -130,23 +137,23 @@ export async function createTable(context, options) {
 function createRecordColumns() {
 	const records = {
 		_createby: {
-			data_fieldname: '_createby', data_type: 'bigint', data_allownull: false, description: 'user yang pertama kali membuat record ini',
-			Reference: {table: '',pk: ''}
+			data_fieldname: '_createby', data_type: 'integer', data_allownull: false, description: 'user yang pertama kali membuat record ini',
+			Reference: { table: '', pk: '' }
 		},
-		
+
 		_createdate: {
-			data_fieldname: '_createdate', data_type: 'timestamp', data_allownull: false, description: 'waktu record dibuat pertama kali',
-			Reference: {table: '',pk: ''}
+			data_fieldname: '_createdate', data_type: 'timestamp', data_allownull: false, data_defaultvalue: 'now()', description: 'waktu record dibuat pertama kali',
+			Reference: { table: '', pk: '' }
 		},
-		
+
 		_modifyby: {
-			data_fieldname: '_modifyby', data_type: 'bigint', data_allownull: true, description: 'user yang terakhir modifikasi record ini',
-			Reference: {table: '',pk: ''}
+			data_fieldname: '_modifyby', data_type: 'integer', data_allownull: true, description: 'user yang terakhir modifikasi record ini',
+			Reference: { table: '', pk: '' }
 		},
 
 		_modifydate: {
 			data_fieldname: '_modifydate', data_type: 'timestamp', data_allownull: true, description: 'waktu terakhir record dimodifikasi',
-			Reference: {table: '',pk: ''}
+			Reference: { table: '', pk: '' }
 		}
 	}
 

package/src/generator/helper.js

@@ -6,7 +6,7 @@ export function kebabToCamel(str) {
 	return str
 		.split('-')
 		.map((part, index) =>
-		index === 0 ? part : part.charAt(0).toUpperCase() + part.slice(1)
+			index === 0 ? part : part.charAt(0).toUpperCase() + part.slice(1)
 		)
 		.join('');
 }
@@ -23,11 +23,11 @@ export async function isFileExist(filepath) {
 
 export function getSectionData(moduleName, entityName, data, sectionPart) {
 	const sectionName = kebabToCamel(`${moduleName}-${entityName}-${sectionPart}`)
-	
+
 	let sectionTitle = capitalizeWords(`${sectionPart} ${data.title}`)
-	if (entityName=='header' && sectionPart=='list') {
+	if (entityName == 'header' && sectionPart == 'list') {
 		sectionTitle = capitalizeWords(data.title)
-	} 
+	}
 
 	return {
 		partName: sectionPart,
@@ -50,42 +50,50 @@ export function capitalizeWords(input) {
 
 export function createAdditionalAttributes(item) {
 	const cfg = []
-	
+
 	// Default Value hanya untuk Textbox, Numberbox, Checkbox
 	if (['Textbox', 'Numberbox', 'Checkbox'].includes(item.component)) {
-		if (item.data_defaultvalue!='') {
+		if (item.data_defaultvalue != '') {
 			cfg.push(`value="${item.data_defaultvalue}"`)
 		}
 	}
 
-	if (item.index!='' && item.index!='0') {
+	if (item.index != '' && item.index != '0') {
 		cfg.push(`data-tabindex="${item.index}"`)
 	}
 
 
-	if (item.input_inlinestyle.trim()!='') {
+	if (item.input_inlinestyle.trim() != '') {
 		cfg.push(`style="${item.input_inlinestyle}"`)
 	}
 
 	if (item.input_charcase != 'normal') {
 		cfg.push(`character-case="${item.input_charcase}"`)
 	}
-	
+
 	if (item.Validation.isRequired) {
 		cfg.push('required')
 
-		if (item.Validation.messageRequired.trim()!='') {
+		if (item.Validation.messageRequired.trim() != '') {
 			cfg.push(`invalid-message-required="${item.Validation.messageRequired}"`)
 		}
 	}
 
-	if (item.input_information.trim()!='') {
+	if (item.input_information.trim() != '') {
 		cfg.push(`description="${item.input_information}"`)
 	}
 
 
+	// multiline, hanya untuk textbox
+	if (item.component == 'Textbox') {
+		if (item.input_multiline) {
+			cfg.push('multiline')
+		}
+	}
+
+
 	// data length in character
-	if (item.component=='Textbox') {
+	if (item.component == 'Textbox') {
 		cfg.push(`autocomplete="off" spellcheck="false"`)
 
 		cfg.push(`maxlength="${item.data_length}"`)
@@ -93,57 +101,67 @@ export function createAdditionalAttributes(item) {
 		if (item.Validation.isMinimum) {
 			cfg.push(`minlength="${item.Validation.Minimum}"`)
 
-			if (item.Validation.messageMinimum.trim()!='') {
+			if (item.Validation.messageMinimum.trim() != '') {
 				cfg.push(`invalid-message-minlength="${item.Validation.messageMinimum}"`)
 			}
 		}
 
-	} else if (item.component=='Numberbox') {
-		cfg.push(`maxlength="${item.data_length}"`)
+	} else if (item.component == 'Numberbox') {
+
+		if (item.data_precision > 0) {
+			const datalen = Number(item.data_length) + 1
+			cfg.push(`precision="${item.data_precision}"`)
+			cfg.push(`maxlength="${datalen}"`)
+		} else {
+			cfg.push(`maxlength="${item.data_length}"`)
+		}
+
+
+
 
 		if (item.Validation.isMinimum) {
 			cfg.push(`min="${item.Validation.Minimum}"`)
-			if (item.Validation.messageMinimum.trim()!='') {
+			if (item.Validation.messageMinimum.trim() != '') {
 				cfg.push(`invalid-message-min="${item.Validation.messageMinimum}"`)
 			}
 		}
 
 		if (item.Validation.isMaximum) {
 			cfg.push(`max="${item.Validation.Maximum}"`)
-			if (item.Validation.messageMaximum.trim()!='') {
+			if (item.Validation.messageMaximum.trim() != '') {
 				cfg.push(`invalid-message-max="${item.Validation.messageMaximum}"`)
 			}
 		}
 
-		if (item.data_type=='smallint') {
+		if (item.data_type == 'smallint') {
 			cfg.push(`digitgrouping="false"`)
-		} 
+		}
 
-	} else if (item.component=='Checkbox') {
+	} else if (item.component == 'Checkbox') {
 		cfg.push(`type="checkbox"`)
 
 
-	} else if (item.component=='Combobox') {
-		if (item.Reference.bindingDisplay!='' && item.Reference.bindingDisplay!=null) {
+	} else if (item.component == 'Combobox') {
+		if (item.Reference.bindingDisplay != '' && item.Reference.bindingDisplay != null) {
 			cfg.push(`data-display="${item.Reference.bindingDisplay}"`)
 		} else {
 			cfg.push(`data-display="${item.Reference.bindingText}"`)
 		}
-		
-	}	
+
+	}
 
 	if (item.Validation.hasCustomValidator) {
 		cfg.push(`validator="${item.Validation.customValidator}"`)
 	}
 
-	if (item.Validation.messageDefault.trim()!='') {
+	if (item.Validation.messageDefault.trim() != '') {
 		cfg.push(`invalid-message="${item.Validation.messageDefault}"`)
-	}	
+	}
 
 
 	if (item.input_disabled) {
 		cfg.push('disabled')
 	}
 
-	return cfg      
+	return cfg
 }