fix logout page

.idea/dataSources.xml

@@ -1,24 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="uiapp@192.168.64.6" uuid="21bbb410-6e9c-47c3-8eda-511e7856f454">
+    <data-source source="LOCAL" name="postgres@localhost" uuid="ee0f00df-3ab2-482e-bd30-2c4401540952">
       <driver-ref>postgresql</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.postgresql.Driver</jdbc-driver>
-      <jdbc-url>jdbc:postgresql://192.168.64.6:5432/uiapp</jdbc-url>
-      <jdbc-additional-properties>
-        <property name="com.intellij.clouds.kubernetes.db.host.port" />
-        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
-        <property name="com.intellij.clouds.kubernetes.db.resource.type" value="Deployment" />
-        <property name="com.intellij.clouds.kubernetes.db.container.port" />
-      </jdbc-additional-properties>
-      <working-dir>$ProjectFileDir$</working-dir>
-    </data-source>
-    <data-source source="LOCAL" name="arsalan_rmc_module_app@10.10.10.211" uuid="572880af-561c-4a5a-90bd-e024c09c674b">
-      <driver-ref>postgresql</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
-      <jdbc-url>jdbc:postgresql://10.10.10.211:5432/arsalan_rmc_module_app</jdbc-url>
+      <jdbc-url>jdbc:postgresql://localhost:5432/postgres</jdbc-url>
       <jdbc-additional-properties>
         <property name="com.intellij.clouds.kubernetes.db.host.port" />
         <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />

.idea/data_source_mapping.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourcePerFileMappings">
+    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/ee0f00df-3ab2-482e-bd30-2c4401540952/console.sql" value="ee0f00df-3ab2-482e-bd30-2c4401540952" />
+  </component>
+</project>

.idea/ebean-plugin.xml

@@ -2,6 +2,6 @@
 <project version="4">
   <component name="ebeanPlugin11">
     <option name="enabled" value="true" />
-    <option name="agentPath" value="$APPLICATION_PLUGINS_DIR$/ebean-idea/lib/ebean-agent-13.22.0.jar" />
+    <option name="agentPath" value="$APPLICATION_PLUGINS_DIR$/ebean-idea/lib/ebean-agent-15.12.0.jar" />
   </component>
 </project>

.idea/kotlinc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.7.10" />
+    <option name="version" value="2.0.0" />
   </component>
 </project>

.idea/vcs.xml

@@ -2,6 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/../txn_workflow" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../rmc_modules_app" vcs="Git" />
   </component>
 </project>

api.http

@@ -386,3 +386,21 @@ Authorization: {{auth-token}}
 GET http://localhost:9001/api/vendor/incoming/next
 Content-Type: application/json
 Authorization: {{auth-token}}
+
+###
+POST http://localhost:9001/api/expense/execute
+Content-Type: application/json
+Authorization: {{auth-token}}
+
+{
+  "script": "vehicle.kts",
+  "fn": "execute",
+  "params": {
+    "a": "1",
+    "b": 2,
+    "c": {
+      "c1": 1,
+      "c2": "2024-04-20"
+    }
+  }
+}

app-sample.yaml

@@ -1,4 +1,4 @@
-#DO Not edit this file, copy to your HOME Directory and then rename it to app.yaml and then edit it
+#DO Not edit this file, copy to your HOME or Current Directory and then rename it to app.yaml and then edit it
 app:
   db:
     pass: postgres

app_conf.yaml

@@ -1,61 +0,0 @@
-#DO Not edit this file, copy to your HOME Directory and then rename it to app.yaml and then edit it
-app:
-  db:
-    pass: password
-    url: jdbc:postgresql://10.10.10.211/arsalan_rmc_module_app
-    user: arsalan
-    name: arsalan_rmc_module_app	
-    run_migration: 'true'
-  cors:
-    enabled: 'true'
-    hosts: www.readymixerp.com,app.readymixerp.com
-  port: '9001'
-  cache:
-    redis_uri: redis://10.10.10.112:6379/
-  iam:
-    url: https://auth.readymixerp.com
-    realm: rmc-dev
-    client_redirect_uri: http://localhost:9001/auth/code
-    client: rmc
-  scripts:
-    path: /Users/gowthaman.b/IdeaProjects/rmc_modules_api/src/main/resources/scripts
-  security:
-    private_key: |-
-      -----BEGIN PRIVATE KEY-----
-      MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD4ba8OhlyB9MUx
-      MFmT8c9sOKqXOG6ZM6qLxr5SnY1au47rYsHXt8Hb+tTUxpkf+5bndaZYGVgQ1mtw
-      eEVj3qZq9A+FnxxwZ9uIIdbOUPvsZLzNYnK3bFFRsmWMf30gDs6ZdS63b2tnXXE0
-      aoItwVguElUKVXKUymS0VlBB0ZLCYTlD6Q4sDm7HGXJZj5kVNVbBCBe42yLx8Y1F
-      TyNL8nPSS+SAdLUaPJ/6j+741+exAIOc0rSBJOMF0XNOwBZ85EuOiPa0e1sUz0qj
-      VfmZyeRFxkSWJBnqum1jrVFp55bMb37DYtZa0aFIcPdDfY42frDlPLcI4zzRwCn3
-      ggHL/nL9AgMBAAECggEAJ85sxu8zl8/l4EsG3M8EdVWidrGgUyRgDElFCiLcWVta
-      prqVJIt5YNYRJU5J5Jc2fRGxHPEOrJVW84IUsvskVQM/ZiHyd3ZvdaGKdFZYpO5t
-      VvGSlR53l0IhGxal24L+isCn7X+ec5pu6b8JQJX4RbBConHCTDdz/yDMzQcXiiqj
-      ezzSovZ1Xy/2dn7sOTFtEZi47d3AhBnjh8Xqk3Dc9UChooxuIU6WEbqWFxEkbzJS
-      sXIv9xADVDqFqjHGv6Tk1W+y7y8M2EHosJfhO0LmWFL7nUdw0WSJV+UqQxHrUSJs
-      SnYHkKRTYl2ljpjkuECp/YqUqdlNq/5T5jBE6cyopwKBgQD6+XGZfssdAqfnaEK2
-      nHdUAdklUFAFQpSmwIUwTZEHDC/CD+ErVjfbEfZ2mFOvWAIMwLmiLFuDT7E5sHaT
-      K4A2DQ8KyU3iJkH4nhxdYepLc7MSYElkn6fHNrXcJ9vPACmrtoa9rVW/LpAjsRq6
-      fDxLo12/+EmFvpZ0oEAIQXk6ZwKBgQD9ZzBgPapI8m7cjcdojqq0dJ2M5Sw7Bx5n
-      VFOC3H4Cx0xWTdwwZ9CZQ4v/XiiHiUGzwhfkNJ2x3DdpUCkPDD8o3cFXPRW4GsjD
-      kv/D0kL/JJAesG9XB9yMTMBoe2yGMudDVc7SYgUI2YXhmHYkpcjSzM0DftLL2Z47
-      GY1h385Q+wKBgGTRxe/Kfp+lzHtqZ7ph+pG1uFyD+dFTINIn7pkr38G8BIdpx6OY
-      HBIWEjMsGBoNOa2T0j6yoQSMA/7Pw6J1TCjqcAt+OJpLkh7krTJaPjuXO+163qDc
-      fhLKCJ5rKKLsRtEjHtedhR+q/d5IrBsUA0jDVMrkW+ytVlV9dpuaaa+rAoGASON8
-      m8JBD/iEAPbbK+0VlxCQHO3ymgwDJ8+usc6AhIYVJCIDOv0xmFRAmbTYzZuihXVH
-      8AFedsGUQrunA8gPBs86hMByVeGGbBMFdKsvUDqRJfK0JAGD4+tT0PnnjnZn5Qty
-      kTtWnWQMSYbUPNhe+pukQOQi+DXheLhx3XxF2S8CgYEAopLjGIR/xeuV7QkGJfCO
-      d2wEJROBPd3pbDlR4fLDO8RCw3irFYQgQd9WgGJY5KgyfjKLHkK7DMQKn+/yfUp5
-      UKeesBDXATpyQQrpfoKIhhZKtYphOwvIzugtLsd5sza++sjC9RwkRmYr0rzlHdUl
-      vtr3fru0Bzven2MeiQnqmCM=
-      -----END PRIVATE KEY-----
-    public_key: |-
-      -----BEGIN PUBLIC KEY-----
-      MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+G2vDoZcgfTFMTBZk/HP
-      bDiqlzhumTOqi8a+Up2NWruO62LB17fB2/rU1MaZH/uW53WmWBlYENZrcHhFY96m
-      avQPhZ8ccGfbiCHWzlD77GS8zWJyt2xRUbJljH99IA7OmXUut29rZ11xNGqCLcFY
-      LhJVClVylMpktFZQQdGSwmE5Q+kOLA5uxxlyWY+ZFTVWwQgXuNsi8fGNRU8jS/Jz
-      0kvkgHS1Gjyf+o/u+NfnsQCDnNK0gSTjBdFzTsAWfORLjoj2tHtbFM9Ko1X5mcnk
-      RcZEliQZ6rptY61RaeeWzG9+w2LWWtGhSHD3Q32ONn6w5Ty3COM80cAp94IBy/5y
-      /QIDAQAB
-      -----END PUBLIC KEY-----

build.gradle.kts

@@ -24,19 +24,19 @@ dependencies {
     implementation("io.javalin:javalin:5.6.3")
     implementation("io.ebean:ebean:13.23.2")
     implementation("io.ebean:ebean-querybean:13.23.2")
-    implementation("org.postgresql:postgresql:42.6.0")
+    implementation("org.postgresql:postgresql:42.7.3")
     implementation("io.ebean:ebean-migration:13.11.1")
     implementation("io.ebean:ebean-ddl-generator:13.23.2")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.15.+")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.+")
-    implementation("ch.qos.logback:logback-core:1.4.12")
+    implementation("ch.qos.logback:logback-core:1.5.6")
     implementation("ch.qos.logback:logback-classic:1.4.12")
     implementation("org.bitbucket.b_c:jose4j:0.9.4")
     implementation("redis.clients:jedis:5.0.2")
-    implementation("org.bouncycastle:bcprov-jdk18on:1.76")
-    implementation("org.bouncycastle:bcpkix-jdk18on:1.76")
+    implementation("org.bouncycastle:bcprov-jdk18on:1.78.1")
+    implementation("org.bouncycastle:bcpkix-jdk18on:1.78.1")
     implementation("org.yaml:snakeyaml:2.2")
-    implementation("io.minio:minio:8.5.7")
+    implementation("io.minio:minio:8.5.11")
     implementation("org.apache.httpcomponents:httpclient:4.5.14")
     implementation("org.apache.poi:poi:5.2.3")
     implementation("org.apache.poi:poi-ooxml:5.2.3")
@@ -45,6 +45,13 @@ dependencies {
     api("net.cactusthorn.config:config-yaml:0.81")
     kapt("net.cactusthorn.config:config-compiler:0.81")
     kapt("io.ebean:kotlin-querybean-generator:13.23.2")
+    implementation("org.graalvm.polyglot:polyglot:24.0.2")
+    implementation("org.graalvm.polyglot:js:24.0.2")
+    implementation(kotlin("script-runtime"))
+    implementation(kotlin("scripting-jsr223"))
+    //implementation("org.jetbrains.kotlin:kotlin-scripting-jsr223:1.9.20")
+    //implementation("org.jetbrains.kotlin:kotlin-script-runtime:1.9.20")
+
 }
 
 tasks.test {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
+fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +214,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

settings.gradle.kts

@@ -6,7 +6,8 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+    id("de.fayard.refreshVersions") version "0.60.5"
 }
 
 rootProject.name = "rest_api"

src/main/kotlin/com/restapi/Main.kt

@@ -296,9 +296,9 @@ fun main(args: Array<String>) {
             post("/{entity}/next", Entities::getNextSeqNo, Roles(adminRole, viewRole, appAdmin))
             get("/{entity}/{id}", Entities::view, Roles(adminRole, viewRole, appAdmin))
             post("/{entity}/search", Entities::search, Roles(adminRole, viewRole, appAdmin))
+            post("/{entity}/execute", Entities::execute, Roles(adminRole, createRole, appAdmin))
             post("/{entity}", Entities::create, Roles(adminRole, createRole, appAdmin))
 
-
             put("/{entity}/{id}", Entities::update, Roles(adminRole, updateRole, appAdmin))
             patch("/{entity}/{id}", Entities::patch, Roles(adminRole, updateRole, appAdmin))
             delete("/{entity}/{id}", Entities::delete, Roles(adminRole, Role.Standard(Action.DELETE), appAdmin))

src/main/kotlin/com/restapi/controllers/Entities.kt

@@ -145,7 +145,17 @@ object Entities {
         val entity = ctx.pathParam("entity").lowercase()
         val noCreatedFilter = currentRoles().contains("ROLE_ADMIN") || sql.createdBy.isNullOrEmpty()
         val createdFilter = if (noCreatedFilter) "" else "and created_by = :cBy"
-        val searchJsonMap = sql.params.map { e -> Pair(e.key, e.value.getValue()) }.toMap()
+        val searchJsonMap = sql.params.map { e -> Pair(e.key, e.value.getValue()) }
+            .filter {
+                val second = it.second
+                if (second is String) {
+                    second.isNotEmpty()
+                } else {
+                    true
+                }
+            }
+            .toMap()
+        logger.warn("convert ${sql.params} to $searchJsonMap")
         val fl = database.find(DataModel::class.java)
             .setRawSql(
                 RawSqlBuilder.parse(
@@ -174,7 +184,7 @@ object Entities {
                   and data @> cast(:search as jsonb)
                   and deleted = false
                   $createdFilter
-                  order by sysPk desc
+                  order by ${sql.orderBy}
             """.trimIndent()
                 ).create()
             )
@@ -249,6 +259,25 @@ object Entities {
         )
     }
 
+    data class Execute(val script: String, val fn: String, val params: Map<String, Any>)
+
+    fun execute(ctx: Context) {
+        val entity = ctx.pathParam("entity")
+
+        val body = ctx.bodyAsClass<Execute>()
+
+        //may be approval flow is configured?
+        val setupEntity = database.find(EntityModel::class.java)
+            .where()
+            .eq("name", entity)
+            .findOne()
+
+        ctx.json(
+            Scripting.execute(body.script, body.fn, body.params, setupEntity)
+        )
+
+    }
+
     fun create(ctx: Context) {
 
         val entity = ctx.pathParam("entity")
@@ -336,7 +365,7 @@ object Entities {
         )
 
         if (setupEntity != null && !setupEntity.postSaveScript.isNullOrEmpty()) {
-            Scripting.execute(setupEntity.postSaveScript!!, "postSave", dataModel)
+            Scripting.execute(setupEntity.postSaveScript!!, "postSave", dataModel, setupEntity)
         }
 
 
@@ -376,7 +405,8 @@ object Entities {
 data class SearchParams(
     val params: Map<String, QueryParam> = mapOf(),
     val createdBy: String?,
-    val dateRange: List<LocalDate> = listOf(LocalDate.now().minusDays(7), LocalDate.now())
+    val dateRange: List<LocalDate> = listOf(LocalDate.now().minusDays(7), LocalDate.now()),
+    val orderBy: String = "sysPk asc"
 )
 
 data class SequenceNumber(val number: String)

src/main/kotlin/com/restapi/controllers/Excel.kt

@@ -14,6 +14,7 @@ import java.io.FileOutputStream
 import java.text.SimpleDateFormat
 import java.time.LocalDate
 import java.time.ZoneId
+import java.time.format.DateTimeFormatter
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 
@@ -357,7 +358,8 @@ fun exportIncomingInventory(tickets: List<IncomingInventory>) {
 
     val headers: List<String> = listOf(
         "MRN",
-        "Date",
+        "Inward Date",
+        "Entry Date",
         "Vendor Name",
         "Vendor Bill Number",
         "Vendor Bill Amount",
@@ -367,18 +369,22 @@ fun exportIncomingInventory(tickets: List<IncomingInventory>) {
         "Product Name",
         "Unit Price",
         "Quantity",
+        "PO Number",
+        "PO Date",
     )
     createHeaderRow(headers, sh, wb)
 
     var rowCnt = 1
     for (ticket in tickets) {
-        val prodCnt = ticket.products?.size
+        val products = ticket.products ?: continue
+        val prodCnt = products.size
 
-        for (j in 0..<prodCnt!!) {
+        for (j in 0..<prodCnt) {
             val row = sh.createRow(rowCnt++)
             var i = 0
             row.createCell(i++).setCellValue(ticket.mrn)
-            row.createCell(i++).setCellValue(ticket.date)
+            row.createCell(i++).setCellValue(ticket.date?.format(DateTimeFormatter.ofPattern("dd/MM/yyyy ")) ?: "")
+            row.createCell(i++).setCellValue(ticket.createdAt?.format(DateTimeFormatter.ofPattern("dd/MM/yyyy ")) ?: "")
             row.createCell(i++).setCellValue(ticket.vendor?.name)
             row.createCell(i++).setCellValue(ticket.vendorBillNum)
             row.createCell(i++).setCellValue(ticket.vendorBillAmount)
@@ -387,12 +393,21 @@ fun exportIncomingInventory(tickets: List<IncomingInventory>) {
             row.createCell(i++).setCellValue(ticket.unloading)
 
             //6 would be repeated
-            row.createCell(i++).setCellValue(ticket.products!![j].productName)
-            row.createCell(i++).setCellValue(ticket.products!![j].unitPrice)
-            row.createCell(i++).setCellValue(ticket.products!![j].quantity)
+            val poProduct = products[j]
+            row.createCell(i++).setCellValue(poProduct.productName)
+            row.createCell(i++).setCellValue(poProduct.unitPrice)
+            row.createCell(i++).setCellValue(poProduct.quantity)
+            if (poProduct.poId != null) {
+                val po = database.find(PurchaseOrder::class.java, poProduct.poId)
+                row.createCell(i++).setCellValue(po?.poNum ?: "")
+                row.createCell(i++).setCellValue(po?.poDate?.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) ?: "")
+            } else {
+                row.createCell(i++).setCellValue("")
+                row.createCell(i++).setCellValue("")
 
             }
         }
+    }
     saveExcelFileLocally("IncomingInventory.xls", wb)
 }
 
@@ -401,13 +416,16 @@ fun exportOutgoingInventory(tickets: List<OutgoingInventory>) {
     val sh = wb.createSheet()
 
     val headers: List<String> = listOf(
+        "Plant",
         "MDN",
-        "Date",
+        "Outward Date",
+        "Entry Date",
         "Out Mode",
         "Purpose",
-        "Product Id",
+        "Person",
+        "Vehicle",
+        "Job Card",
         "Product Name",
-        "Unit Price",
         "Quantity",
     )
     createHeaderRow(headers, sh, wb)
@@ -419,16 +437,19 @@ fun exportOutgoingInventory(tickets: List<OutgoingInventory>) {
         for (j in 0..<prodCnt!!) {
             val row = sh.createRow(rowCnt++)
             var i = 0
+            row.createCell(i++).setCellValue(ticket.unloading)
             row.createCell(i++).setCellValue(ticket.mdn)
-            row.createCell(i++).setCellValue(ticket.date)
-            row.createCell(i++).setCellValue(ticket.outMode.toString())
+            row.createCell(i++).setCellValue(ticket.date?.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) ?: "")
+            row.createCell(i++).setCellValue(ticket.createdAt?.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) ?: "")
+            row.createCell(i++).setCellValue(ticket.outMode?.name ?: "")
             row.createCell(i++).setCellValue(ticket.purpose)
+            row.createCell(i++).setCellValue(ticket.person)
+            row.createCell(i++).setCellValue(ticket.vehicle)
+            row.createCell(i++).setCellValue(ticket.jobCard)
 
             //6 would be repeated
-            row.createCell(i++).setCellValue(ticket.products!![j].productId.toString())
             row.createCell(i++).setCellValue(ticket.products!![j].productName)
-            row.createCell(i++).setCellValue(ticket.products!![j].unitPrice)
-            row.createCell(i++).setCellValue(ticket.products!![j].quantity)
+            row.createCell(i++).setCellValue(ticket.products!![j].billQty)
 
         }
     }

src/main/kotlin/com/restapi/controllers/Filters.kt

@@ -2,6 +2,7 @@ package com.restapi.controllers
 
 import com.restapi.domain.*
 import com.restapi.domain.Session.database
+import io.ebean.ExpressionList
 import net.jodah.expiringmap.ExpiringMap
 import java.time.LocalDate
 import java.util.concurrent.TimeUnit
@@ -239,19 +240,25 @@ fun searchIncomingInventory(
     applyVendorHelper(q, commonFilters.vendor)
     applyPlantFilter(q, commonFilters.plant)
     applySortHelper(q, commonFilters.sortBy, commonFilters.sortAsc)
+    applyInwardFilter(q, incomingInventoryFilters)
     return q.findList()
 }
 
+fun applyInwardFilter(q: ExpressionList<IncomingInventory>, incomingInventoryFilters: IncomingInventoryFilters) {
+    if (incomingInventoryFilters.mrnLike.isNotEmpty() && incomingInventoryFilters.mrnLike != "%") {
+        q.eq("mrn", incomingInventoryFilters.mrnLike)
+    }
+}
+
 fun searchOutgoingInventory(
     commonFilters: CommonFilters,
     outgoingInventoryFilters: OutgoingInventoryFilters
 ): List<OutgoingInventory> {
-    val q = database.find(OutgoingInventory::class.java)
-        .where()
-      //  .ilike("mdn", "%" + outgoingInventoryFilters.mdnLike + "%")
-      //  .ilike("purpose", "%" + outgoingInventoryFilters.purposeLike + "%")
-    // .ilike("person", "%" + outgoingInventoryFilters.personLike + "%")
-    //.ilike("vehicle", "%" + outgoingInventoryFilters.vehicleLike + "%")
+    val q = database.find(OutgoingInventory::class.java).where()
+
+    if (outgoingInventoryFilters.mdnLike.isNotEmpty() && outgoingInventoryFilters.mdnLike != "%") {
+        q.eq("mdn", outgoingInventoryFilters.mdnLike)
+    }
     if (outgoingInventoryFilters.outMode != OutMode.ALL) {
         q.eq("outMode", outgoingInventoryFilters.outMode)
     }

src/main/kotlin/com/restapi/domain/db.kt

@@ -30,6 +30,7 @@ import java.security.spec.PKCS8EncodedKeySpec
 import java.security.spec.X509EncodedKeySpec
 import java.time.LocalDateTime
 import java.util.*
+import java.util.concurrent.ConcurrentHashMap
 import kotlin.jvm.optionals.getOrDefault
 
 
@@ -185,8 +186,11 @@ object Session {
 
     private fun seqName(entity: String) = "sequence_${entity}_${currentTenant()}"
 
+    private val seqCreationCache = ConcurrentHashMap<String, Int>()
     fun creatSeq(entity: String): Int {
-        return database.sqlUpdate("CREATE SEQUENCE IF NOT EXISTS ${seqName(entity)} START 1;").execute()
+        return seqCreationCache.computeIfAbsent(entity){
+            database.sqlUpdate("CREATE SEQUENCE IF NOT EXISTS ${seqName(entity)} START 1;").execute()
+        }
     }
 
     fun nextUniqId(entity: String): String {

src/main/kotlin/com/restapi/domain/models.kt

@@ -285,6 +285,14 @@ open class Plant : BaseModel() {
             this.clear()
             this.putAll(p.prefixes ?: emptyMap())
         }
+        this.print?.apply {
+            this.clear()
+            this.putAll(p.print ?: emptyMap())
+        }
+        this.limits?.apply {
+            this.clear()
+            this.putAll(p.limits ?: emptyMap())
+        }
         this.save()
     }
 
@@ -292,8 +300,12 @@ open class Plant : BaseModel() {
     var plantName: String = ""
     var plantOriginalName: String? = ""
 
+    @DbJsonB
+    var print: MutableMap<String, String>? = mutableMapOf()
     @DbJsonB
     var prefixes: MutableMap<String, String>? = mutableMapOf()
+    @DbJsonB
+    var limits: MutableMap<String, String>? = mutableMapOf()
 }
 
 class RefreshHistory {

src/main/kotlin/com/restapi/integ/Scripting.kt

@@ -2,6 +2,7 @@ package com.restapi.integ
 
 import com.restapi.config.AppConfig.Companion.appConfig
 import com.restapi.domain.DataModel
+import com.restapi.domain.EntityModel
 import com.restapi.domain.Session.currentTenant
 import com.restapi.domain.Session.currentUser
 import com.restapi.domain.Session.database
@@ -21,11 +22,11 @@ object Scripting {
         engine as Invocable
     }
 
-    fun execute(scriptName: String, fnName: String, params: Map<String, Any>): Any {
-        return getEngine(scriptName).invokeFunction(fnName, params, database, logger, currentUser(), currentTenant())
+    fun execute(scriptName: String, fnName: String, params: Map<String, Any>, entityModel: EntityModel?,): Any {
+        return getEngine(scriptName).invokeFunction(fnName, params, entityModel, database, logger, currentUser(), currentTenant())
     }
 
-    fun execute(scriptName: String, fnName: String, dataModel: DataModel): Any {
-        return getEngine(scriptName).invokeFunction(fnName, dataModel, database, logger, currentUser(), currentTenant())
+    fun execute(scriptName: String, fnName: String, dataModel: DataModel, entityModel: EntityModel?,): Any {
+        return getEngine(scriptName).invokeFunction(fnName, dataModel, entityModel, database, logger, currentUser(), currentTenant())
     }
 }

src/main/resources/dbmigration/1.37.sql

@@ -0,0 +1,2 @@
+-- apply alter tables
+alter table plant add column if not exists print jsonb;

src/main/resources/dbmigration/1.38.sql

@@ -0,0 +1,2 @@
+-- apply alter tables
+alter table plant add column if not exists limits jsonb;

src/main/resources/dbmigration/model/1.37.model.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
+    <changeSet type="apply">
+        <addColumn tableName="plant">
+            <column name="print" type="jsonb"/>
+        </addColumn>
+    </changeSet>
+</migration>

src/main/resources/dbmigration/model/1.38.model.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
+    <changeSet type="apply">
+        <addColumn tableName="plant">
+            <column name="limits" type="jsonb"/>
+        </addColumn>
+    </changeSet>
+</migration>

src/main/resources/scripts/expense.kts

@@ -0,0 +1,35 @@
+import com.restapi.domain.DataModel
+import com.restapi.domain.EntityModel
+import io.ebean.Database
+import org.slf4j.Logger
+import java.time.LocalDate
+
+fun execute(d: Map<String, Any>, entityModel: EntityModel?, db: Database, logger: Logger, user: String, tenant: String): Map<String, Any> {
+    println("execute on $d")
+    //check if the limits have exceeded in the given month
+
+    //language=PostgreSQL
+    val q = db.sqlQuery(
+        """
+        select sum(cast(data->>'amount' as float)) as amount from data_model
+        where entity_name = 'expense' 
+        and cast(data->>'date' as timestamp) between :f and :t
+        and data->>'plantId' = :p
+    """.trimIndent()
+    )
+    q.setParameter("f", LocalDate.parse(d["fromDate"] as String))
+    q.setParameter("t", LocalDate.parse(d["toDate"] as String))
+    q.setParameter("p", d["plantId"] as String)
+    val sum = q.findOne()?.getLong("amount") ?: 0
+
+    return mapOf("sum" to sum)
+}
+
+fun preSave(d: DataModel, entityModel: EntityModel?, db: Database, logger: Logger, user: String, tenant: String): Boolean {
+    logger.warn("PreSave $d")
+    return true
+}
+
+fun postSave(d: DataModel, entityModel: EntityModel?, db: Database, logger: Logger, user: String, tenant: String) {
+    println("PostSave $d")
+}

src/main/resources/scripts/vehicle.kts

@@ -1,17 +1,18 @@
 import com.restapi.domain.DataModel
+import com.restapi.domain.EntityModel
 import io.ebean.Database
 import org.slf4j.Logger
 
-fun execute(d: Map<String, Any>, db: Database, logger: Logger, user: String, tenant: String): Map<String, Any> {
+fun execute(d: Map<String, Any>, entityModel: EntityModel?, db: Database, logger: Logger, user: String, tenant: String): Map<String, Any> {
     println("execute on $d")
     return d
 }
 
-fun preSave(d: DataModel, db: Database, logger: Logger, user: String, tenant: String): Boolean {
+fun preSave(d: DataModel, entityModel: EntityModel?, db: Database, logger: Logger, user: String, tenant: String): Boolean {
     logger.warn("PreSave $d")
     return true
 }
 
-fun postSave(d: DataModel, db: Database, logger: Logger, user: String, tenant: String) {
+fun postSave(d: DataModel, entityModel: EntityModel?, db: Database, logger: Logger, user: String, tenant: String) {
     println("PostSave $d")
 }

versions.properties

@@ -0,0 +1,10 @@
+#### Dependencies and Plugin versions with their available updates.
+#### Generated by `./gradlew refreshVersions` version 0.60.5
+####
+#### Don't manually edit or split the comments that start with four hashtags (####),
+#### they will be overwritten by refreshVersions.
+####
+#### suppress inspection "SpellCheckingInspection" for whole file
+#### suppress inspection "UnusedProperty" for whole file
+
+version.kotlin=2.0.0