diff --git a/build.gradle b/build.gradle index a5b32cd..a809188 100644 --- a/build.gradle +++ b/build.gradle @@ -95,6 +95,8 @@ dependencies { compile 'org.grails.plugins:grails-markdown:3.0.0' compile 'org.grails.plugins:iCalendar:0.6.4' + compile 'org.grails.plugins:external-config:1.4.0' + // compile "org.grails.plugins:feeds:1.6" @@ -146,4 +148,7 @@ tasks.withType(Test) { war { version "" archiveName = "nibras.war" -} \ No newline at end of file +} + + + diff --git a/grails-app/conf/application.groovy b/grails-app/conf/application.groovy index 6ffc122..10b21d7 100644 --- a/grails-app/conf/application.groovy +++ b/grails-app/conf/application.groovy @@ -10,7 +10,7 @@ grails.plugin.springsecurity.userLookup.userDomainClassName = 'security.User' grails.plugin.springsecurity.userLookup.authorityJoinClassName = 'security.UserRole' grails.plugin.springsecurity.authority.className = 'security.Role' grails.plugin.springsecurity.controllerAnnotations.staticRules = [ - [pattern: '/', access: ['permitAll']], +// [pattern: '/', access: ['permitAll']], // [pattern: '/**', access: ['permitAll']], [pattern: '/error', access: ['permitAll']], [pattern: '/index', access: ['permitAll']], @@ -20,12 +20,13 @@ grails.plugin.springsecurity.controllerAnnotations.staticRules = [ [pattern: '/assets/**', access: ['permitAll']], [pattern: '/**/js/**', access: ['permitAll']], [pattern: '/**/plugins/**', access: ['permitAll']], - [pattern: '/**/console/**', access: ['permitAll']], - [pattern: '/**/static/console/**', access: ['permitAll']], +// [pattern: '/**/console/**', access: ['permitAll']], +// [pattern: '/**/static/console/**', access: ['permitAll']], [pattern: '/**/page/heartbeat/**', access: ['permitAll']], [pattern: '/**/sync/**', access: ['permitAll']], [pattern: '/**/css/**', access: ['permitAll']], // [pattern: '/**/slides/**', access: ['permitAll']], + [pattern: '/**/fonts/**', access: ['permitAll']], [pattern: '/**/images/**', access: ['permitAll']], [pattern: '/**/favicon.ico', access: ['permitAll']] ] @@ -38,9 +39,19 @@ grails.plugin.springsecurity.filterChain.chainMap = [ [pattern: '/**/js/**', filters: 'none'], [pattern: '/**/css/**', filters: 'none'], [pattern: '/**/images/**', filters: 'none'], - [pattern: '/**/favicon.ico', filters: 'none'] -// [pattern: '/**', filters: 'JOINED_FILTERS'] + [pattern: '/**/fonts/**', filters: 'none'], + [pattern: '/**/favicon.ico', filters: 'none'], +// [pattern: '/**', filters: 'none'] + [pattern: '/**', filters: 'JOINED_FILTERS'] // comment the line above and uncomment this line to enable security ] // todo: war file -grails.project.war.file = "/dev/${appName}.war" \ No newline at end of file +grails.project.war.file = "/dev/${appName}.war" + +grails.config.locations = [ + "classpath:myconfig.properties", + "file:///nbr/myconfig.properties", + "file:${catalina.base}/myconfig.properties", + "~//myconfig.properties" +] + diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml index dae98b2..0989ce0 100644 --- a/grails-app/conf/application.yml +++ b/grails-app/conf/application.yml @@ -21,7 +21,7 @@ grails: info: app: name: nibras - version: 1.0.6 + version: 1.2.0 grailsVersion: '@info.app.grailsVersion@' server: contextPath: '/nibras' @@ -112,12 +112,8 @@ hibernate: environments: h2: dataSource: - pooled: true - jmxExport: true - driverClassName: org.h2.Driver - url: jdbc:h2:./db/h2Db;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE - username: sa - password: '' + dbCreate: update + url: jdbc:h2:../db/nibras;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE properties: jmxEnabled: true initialSize: 5 @@ -162,7 +158,7 @@ environments: testOnReturn: false jdbcInterceptors: ConnectionState defaultTransactionIsolation: 2 # TRANSACTION_READ_COMMITTED - production2: + mysql: dataSource: dbCreate: update jndiName: java:comp/env/jdbc/db_nibras2 @@ -186,7 +182,8 @@ environments: testWhileIdle: true testOnReturn: false jdbcInterceptors: ConnectionState - defaultTransactionIsolation: 2 # TRANSACTION_READ_COMMITTED test: + defaultTransactionIsolation: 2 # TRANSACTION_READ_COMMITTED + test: dataSource: dbCreate: update url: jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE @@ -214,4 +211,7 @@ environments: testWhileIdle: true testOnReturn: false jdbcInterceptors: ConnectionState - defaultTransactionIsolation: 2 # TRANSACTION_READ_COMMITTED \ No newline at end of file + defaultTransactionIsolation: 2 # TRANSACTION_READ_COMMITTED +# - classpath:'@info.app.grailsVersion@'.groovy +# - classpath:myconfig.yml + diff --git a/grails-app/controllers/ker/PageController.groovy b/grails-app/controllers/ker/PageController.groovy index 4e0fafd..545f162 100644 --- a/grails-app/controllers/ker/PageController.groovy +++ b/grails-app/controllers/ker/PageController.groovy @@ -129,7 +129,7 @@ class PageController { [ ['All journal', 'J', 'Jcal', 'from Journal t where id > 0', 'select count(*) from Journal', 1], ['All plans', 'P', 'Pcal', 'from Planner t where id > 0', 'select count(*) from Planner', 1], - ['All tasks with due dates', 'T', 'Tcal', 'from Task t where endDate is not null', 'select count(*) from Task t where endDate is not null', 1], +// ['All tasks with due dates', 'T', 'Tcal', 'from Task t where endDate is not null', 'select count(*) from Task t where endDate is not null', 1], ['All tasks', 'T', 'Tall', 'from Task t where id > 0', 'select count(*) from Task t', 0], ['All notes', 'N', 'Nall', 'from IndexCard t where id > 0', 'select count(*) from IndexCard t', 0], ['All resources', 'R', 'Rall', 'from Book t where id > 0', 'select count(*) from Book t', 0], @@ -174,7 +174,7 @@ class PageController { ['tasks.enabled', 'yes'], ['resources.enabled', 'yes'], ['fullCalendar.enabled', 'yes'], - ['rangeCalendar.enabled', 'no'], + ['rangeCalendar.enabled', 'yes'], ['coursePanel.enabled', 'yes'], ['commandBar.enabled', 'yes'], ['enable.kanban', 'yes'], @@ -194,7 +194,7 @@ class PageController { ['default.language', 'en'], ['updateResultSet.max-items', '100'], ['accordion.east.default.panel', '1'], - ['accordion.west.default.panel', '1'], + ['accordion.west.default.panel', '0'], ['planner.homepage.default-type', 'knb'], ['repository.languages', 'ar,fa,fr,en'], ['repository.languages.RTL', 'ar,fa'], diff --git a/grails-app/domain/cmn/Setting.groovy b/grails-app/domain/cmn/Setting.groovy index 6773100..01d2ebc 100644 --- a/grails-app/domain/cmn/Setting.groovy +++ b/grails-app/domain/cmn/Setting.groovy @@ -39,6 +39,7 @@ class Setting { // entity id = 51 } static mapping = { + // table "SETTINGS" value(sqlType: 'longtext') summary(sqlType: 'longtext') description(sqlType: 'longtext') diff --git a/grails-app/domain/security/Role.groovy b/grails-app/domain/security/Role.groovy index 6ac90a2..61d3650 100644 --- a/grails-app/domain/security/Role.groovy +++ b/grails-app/domain/security/Role.groovy @@ -18,7 +18,7 @@ class Role implements Serializable { } static mapping = { - table 'security_role' + table 'SECURITY_ROLE' cache true } } diff --git a/grails-app/domain/security/User.groovy b/grails-app/domain/security/User.groovy index 8703c27..099c0b0 100644 --- a/grails-app/domain/security/User.groovy +++ b/grails-app/domain/security/User.groovy @@ -28,7 +28,7 @@ class User implements Serializable { } static mapping = { - table 'security_user' + table 'SECURITY_USER' password column: '`password`' } diff --git a/grails-app/domain/security/UserRole.groovy b/grails-app/domain/security/UserRole.groovy index 9b80eda..2eafb75 100644 --- a/grails-app/domain/security/UserRole.groovy +++ b/grails-app/domain/security/UserRole.groovy @@ -81,7 +81,7 @@ class UserRole implements Serializable { } static mapping = { - table 'security_user_role' + table 'SECURITY_USER_ROLE' id composite: ['user', 'role'] version false } diff --git a/grails-app/init/nibras/BootStrap.groovy b/grails-app/init/nibras/BootStrap.groovy index e5c851d..bacd27c 100644 --- a/grails-app/init/nibras/BootStrap.groovy +++ b/grails-app/init/nibras/BootStrap.groovy @@ -7,6 +7,7 @@ class BootStrap { def init = { servletContext -> + def adminRole = new Role(authority: 'ROLE_ADMIN').save() def testUser = new User(username: 'nibras', password: 'nibras').save() diff --git a/grails-app/views/appCalendar/main.gsp b/grails-app/views/appCalendar/main.gsp index d71a517..a00a7ce 100644 --- a/grails-app/views/appCalendar/main.gsp +++ b/grails-app/views/appCalendar/main.gsp @@ -131,7 +131,7 @@ weekNumbers: true, weekNumbersWithinDays: true, weekNumberCalculation: 'ISO', - events:"/nibras/export/allCalendarEvents", + events:"${request.contextPath}/export/allCalendarEvents", selectable: true, selectHelper: true, @@ -166,7 +166,7 @@ end: arg.end }; jQuery('#logArea').html(title); - jQuery('#logArea2').load('/nibras/operation/addNewFromCalendar', { + jQuery('#logArea2').load('${request.contextPath}/operation/addNewFromCalendar', { title: title, start: moment(arg.start).format('DD.MM.YYYY HH:mm'),//arg.start.getDate() + '.' + arg.start.getMonth() + '.'+ (parseInt(arg.start.getYear()) + 1900), end: moment(arg.end).format('DD.MM.YYYY HH:mm')//,//arg.start.getDate() + '.' + arg.start.getMonth() + '.'+ (parseInt(arg.start.getYear()) + 1900), diff --git a/grails-app/views/appCourse/_north.gsp b/grails-app/views/appCourse/_north.gsp index 6c33a82..3f6073d 100644 --- a/grails-app/views/appCourse/_north.gsp +++ b/grails-app/views/appCourse/_north.gsp @@ -86,7 +86,7 @@ %{----}% - %{----}% %{----}% @@ -147,7 +147,7 @@ // this['value'] = 'on' this['checked'] = true // console.log(this.attr('value')); - jQuery('#logRegion').load('/nibras/generics/selectOnly/' + this['name'].split('-')[2] + this['name'].split('-')[1]); + jQuery('#logRegion').load('${request.contextPath}/generics/selectOnly/' + this['name'].split('-')[2] + this['name'].split('-')[1]); }); }) @@ -155,7 +155,7 @@ $("input[name^='select-']").each(function () { this['checked'] = false // console.log(this.attr('value')); - jQuery('#logRegion').load('/nibras/generics/deselectOnly/' + this['name'].split('-')[2] + this['name'].split('-')[1]); + jQuery('#logRegion').load('${request.contextPath}/generics/deselectOnly/' + this['name'].split('-')[2] + this['name'].split('-')[1]); }); }) \ No newline at end of file diff --git a/grails-app/views/appCourse/_regions.gsp b/grails-app/views/appCourse/_regions.gsp index 2da0031..d0f6f1d 100644 --- a/grails-app/views/appCourse/_regions.gsp +++ b/grails-app/views/appCourse/_regions.gsp @@ -312,7 +312,7 @@ jQuery("#chosenTagsArt").chosen({allow_single_deselect: true, no_results_text: "None found"}); // jQuery("#addXcdFormNgs").relatedSelects({ - // onChangeLoad: '/nibras/generics/fetchCoursesForDepartment', + // onChangeLoad: '${request.contextPath}/generics/fetchCoursesForDepartment', // defaultOptionText: '', // selects: { // 'department.id': {loadingMessage: ''}, @@ -321,7 +321,7 @@ // }); jQuery("#addArticleFormNgs").relatedSelects({ - onChangeLoad: '/nibras/generics/fetchCoursesForDepartment', + onChangeLoad: '${request.contextPath}/generics/fetchCoursesForDepartment', defaultOptionText: '', selects: { 'department.id': {loadingMessage: ''}, @@ -329,7 +329,7 @@ } }); jQuery("#addXcdFormNgs").relatedSelects({ - onChangeLoad: '/nibras/generics/fetchWritingsForCourse', + onChangeLoad: '${request.contextPath}/generics/fetchWritingsForCourse', defaultOptionText: '', selects: { 'course.id': {loadingMessage: ''}, diff --git a/grails-app/views/appCourse/main.gsp b/grails-app/views/appCourse/main.gsp index b1f1fc8..fdb0dfd 100644 --- a/grails-app/views/appCourse/main.gsp +++ b/grails-app/views/appCourse/main.gsp @@ -89,7 +89,7 @@ \ No newline at end of file diff --git a/grails-app/views/appKanban/_regions.gsp b/grails-app/views/appKanban/_regions.gsp index 8541a98..d48ba29 100644 --- a/grails-app/views/appKanban/_regions.gsp +++ b/grails-app/views/appKanban/_regions.gsp @@ -56,7 +56,7 @@ %{--

T / context

--}% - + @@ -259,7 +259,7 @@ jQuery("#chosenTagsArt").chosen({allow_single_deselect: true, no_results_text: "None found"}); // jQuery("#addXcdFormNgs").relatedSelects({ - // onChangeLoad: '/nibras/generics/fetchCoursesForDepartment', + // onChangeLoad: '${request.contextPath}/generics/fetchCoursesForDepartment', // defaultOptionText: '', // selects: { // 'department.id': {loadingMessage: ''}, @@ -268,7 +268,7 @@ // }); jQuery("#addArticleFormNgs").relatedSelects({ - onChangeLoad: '/nibras/generics/fetchCoursesForDepartment', + onChangeLoad: '${request.contextPath}/generics/fetchCoursesForDepartment', defaultOptionText: '', selects: { 'department.id': {loadingMessage: ''}, @@ -276,7 +276,7 @@ } }); jQuery("#addXcdFormNgs").relatedSelects({ - onChangeLoad: '/nibras/generics/fetchWritingsForCourse', + onChangeLoad: '${request.contextPath}/generics/fetchWritingsForCourse', defaultOptionText: '', selects: { 'course.id': {loadingMessage: ''}, diff --git a/grails-app/views/appKanban/main.gsp b/grails-app/views/appKanban/main.gsp index 6c2f9e2..ddd057c 100644 --- a/grails-app/views/appKanban/main.gsp +++ b/grails-app/views/appKanban/main.gsp @@ -85,7 +85,7 @@ \ No newline at end of file diff --git a/grails-app/views/appMain/_regions.gsp b/grails-app/views/appMain/_regions.gsp index d305137..8b61141 100644 --- a/grails-app/views/appMain/_regions.gsp +++ b/grails-app/views/appMain/_regions.gsp @@ -267,11 +267,11 @@ @@ -289,7 +289,7 @@ jQuery("#chosenTagsArt").chosen({allow_single_deselect: true, no_results_text: "None found"}); // jQuery("#addXcdFormNgs").relatedSelects({ - // onChangeLoad: '/nibras/generics/fetchCoursesForDepartment', + // onChangeLoad: '${request.contextPath}/generics/fetchCoursesForDepartment', // defaultOptionText: '', // selects: { // 'department.id': {loadingMessage: ''}, diff --git a/grails-app/views/appMain/_west.gsp b/grails-app/views/appMain/_west.gsp index 7908e3d..679e2ff 100644 --- a/grails-app/views/appMain/_west.gsp +++ b/grails-app/views/appMain/_west.gsp @@ -33,11 +33,11 @@

Export:

    -
  • G/T to Todo.txt
    • -
  • Export J/T/P to ics calendar
    • @@ -51,7 +51,7 @@ %{--
      --}% %{--
    • --}% - %{----}% %{----}% %{----}% @@ -72,27 +72,27 @@ %{--
      • --}% %{--
    • --}% - %{----}% %{----}% %{----}% %{----}% %{--
      • --}% %{--
    • --}% - %{----}% + %{----}% %{----}% %{----}% %{--
      • --}% %{--
    • --}% - %{----}% + %{----}% %{----}% %{----}% %{--
      • --}% %{--
    • --}% - %{----}% + %{----}% %{----}% %{----}% @@ -438,7 +438,7 @@ }" optionKey="code" optionValue="name" style="direction: ltr; text-align: left; width: 185px !important" noSelection="${['null': 'Choose type']}" - onchange="jQuery('#searchForm').load('/nibras/generics/hqlSearchForm/' + this.value);" + onchange="jQuery('#searchForm').load('${request.contextPath}/generics/hqlSearchForm/' + this.value);" value=""/> diff --git a/grails-app/views/appMain/daftar.gsp b/grails-app/views/appMain/daftar.gsp index 7eb69e4..decde29 100644 --- a/grails-app/views/appMain/daftar.gsp +++ b/grails-app/views/appMain/daftar.gsp @@ -91,7 +91,7 @@ \ No newline at end of file diff --git a/grails-app/views/appMihrab/_regions.gsp b/grails-app/views/appMihrab/_regions.gsp index 77a6484..b54e40a 100644 --- a/grails-app/views/appMihrab/_regions.gsp +++ b/grails-app/views/appMihrab/_regions.gsp @@ -284,7 +284,7 @@ jQuery("#chosenTagsArt").chosen({allow_single_deselect: true, no_results_text: "None found"}); // jQuery("#addXcdFormNgs").relatedSelects({ - // onChangeLoad: '/nibras/generics/fetchCoursesForDepartment', + // onChangeLoad: '${request.contextPath}/generics/fetchCoursesForDepartment', // defaultOptionText: '', // selects: { // 'department.id': {loadingMessage: ''}, @@ -293,7 +293,7 @@ // }); jQuery("#addArticleFormNgs").relatedSelects({ - onChangeLoad: '/nibras/generics/fetchCoursesForDepartment', + onChangeLoad: '${request.contextPath}/generics/fetchCoursesForDepartment', defaultOptionText: '', selects: { 'department.id': {loadingMessage: ''}, @@ -301,7 +301,7 @@ } }); jQuery("#addXcdFormNgs").relatedSelects({ - onChangeLoad: '/nibras/generics/fetchWritingsForCourse', + onChangeLoad: '${request.contextPath}/generics/fetchWritingsForCourse', defaultOptionText: '', selects: { 'course.id': {loadingMessage: ''}, diff --git a/grails-app/views/appMihrab/main.gsp b/grails-app/views/appMihrab/main.gsp index cbc503c..dba654c 100644 --- a/grails-app/views/appMihrab/main.gsp +++ b/grails-app/views/appMihrab/main.gsp @@ -85,7 +85,7 @@ \ No newline at end of file diff --git a/grails-app/views/gTemplates/_recordListingBox.gsp b/grails-app/views/gTemplates/_recordListingBox.gsp index 46102af..4e14d92 100644 --- a/grails-app/views/gTemplates/_recordListingBox.gsp +++ b/grails-app/views/gTemplates/_recordListingBox.gsp @@ -126,7 +126,7 @@ // this['value'] = 'on' this['checked'] = true // console.log(this.attr('value')); - jQuery('#logRegion').load('/nibras/generics/selectOnly/' + this['name'].split('-')[2] + this['name'].split('-')[1]); + jQuery('#logRegion').load('${request.contextPath}/generics/selectOnly/' + this['name'].split('-')[2] + this['name'].split('-')[1]); }); }) @@ -134,7 +134,7 @@ $("input[name^='select-']").each(function () { this['checked'] = false // console.log(this.attr('value')); - jQuery('#logRegion').load('/nibras/generics/deselectOnly/' + this['name'].split('-')[2] + this['name'].split('-')[1]); + jQuery('#logRegion').load('${request.contextPath}/generics/deselectOnly/' + this['name'].split('-')[2] + this['name'].split('-')[1]); }); }) diff --git a/grails-app/views/gTemplates/_recordSummary.gsp b/grails-app/views/gTemplates/_recordSummary.gsp index 6d5a338..9519b27 100644 --- a/grails-app/views/gTemplates/_recordSummary.gsp +++ b/grails-app/views/gTemplates/_recordSummary.gsp @@ -91,8 +91,8 @@ data-name="${field}-${entityCode}" style="font-size: 12px; font-weight: normal;" - data-source="/nibras/operation/getQuickEditValues?entity=${entityCode}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" - data-pk="${record.id}" data-url="/nibras/operation/quickSave2" + data-source="${request.contextPath}/operation/getQuickEditValues?entity=${entityCode}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" + data-pk="${record.id}" data-url="${request.contextPath}/operation/quickSave2" data-title="Edit ${field}"> ${record?.type?.code ?'#' + record?.type?.code : '#'} @@ -117,8 +117,8 @@ data-name="${field}-${entityCode}" class="${record.class.declaredFields.name.contains('status') && record.status ? 'status-' + record?.status?.code : ''}" style="${record.status ? record.status?.style : ''}; border-bottom: 0.5px solid #808080; font-size: 11px; font-style: italic; padding-left: 1px; padding-right: 1px; " - data-source="/nibras/operation/getQuickEditValues?entity=${entityCode}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" - data-pk="${record.id}" data-url="/nibras/operation/quickSave2" + data-source="${request.contextPath}/operation/getQuickEditValues?entity=${entityCode}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" + data-pk="${record.id}" data-url="${request.contextPath}/operation/quickSave2" data-title="Edit ${field}"> ${record[field] ? '?' + record[field]?.code : '?'} @@ -170,8 +170,8 @@ %{----}% + %{--data-source="${request.contextPath}/operation/getQuickEditValues?entity=${entityCode}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}"--}% + %{--data-pk="${record.id}" data-url="${request.contextPath}/operation/quickSave2" data-title="Edit ${field}">--}% %{--
      ${record[field]?.code ?: ''}--}% %{--      --}% %{----}% @@ -455,8 +455,8 @@ data-type="select" data-value="${record[field]?.id}" data-name="${field}-${record.entityCode()}" - data-source="/nibras/operation/getQuickEditValues?entity=${record.entityCode()}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" - data-pk="${record.id}" data-url="/nibras/operation/quickSave2" + data-source="${request.contextPath}/operation/getQuickEditValues?entity=${record.entityCode()}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" + data-pk="${record.id}" data-url="${request.contextPath}/operation/quickSave2" data-title="Edit ${field}"> ${record[field]?.code ? '@' + record[field]?.code : '@'} @@ -1036,8 +1036,8 @@ data-value="${record[field]?.id}" data-name="${field}-${entityCode}" style=" border-radius: 3px; font-size: 12px; font-style: italic; padding-left: 3px; padding-right: 3px;" - data-source="/nibras/operation/getQuickEditValues?entity=${entityCode}&field=${field}&rid=${record.id}&date=${new Date().format('hhmmssDDMMyyyy')}" - data-pk="${record.id}" data-url="/nibras/operation/quickSave2" + data-source="${request.contextPath}/operation/getQuickEditValues?entity=${entityCode}&field=${field}&rid=${record.id}&date=${new Date().format('hhmmssDDMMyyyy')}" + data-pk="${record.id}" data-url="${request.contextPath}/operation/quickSave2" data-title="Edit ${field}"> ${record[field] ? (record[field].code ? 'C' + record[field].code : 'C' + record.course) : 'c'} @@ -1055,8 +1055,8 @@ data-value="${record[field]?.id}" data-name="${field}-${entityCode}" style="border-bottom: 0.5px solid #808080; border-radius: 3px; font-size: 11px; font-style: italic; padding-left: 1px; padding-right: 1px;" - data-source="/nibras/operation/getQuickEditValues?entity=${entityCode}&recordId=${record.id}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" - data-pk="${record.id}" data-url="/nibras/operation/quickSave2" + data-source="${request.contextPath}/operation/getQuickEditValues?entity=${entityCode}&recordId=${record.id}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" + data-pk="${record.id}" data-url="${request.contextPath}/operation/quickSave2" data-title="Edit ${field}"> ${record[field] ? (record[field].code ?: record.book?.title) : 'r'} @@ -1105,8 +1105,8 @@ data-value="${record.recordId ?: null}" data-name="${field}-${entityCode}" style=" border-radius: 3px; font-size: 12px; font-style: italic; padding-left: 1px; padding-right: 1px;" - data-source="/nibras/operation/getQuickEditValues?entity=${entityCode}&field=${field}&recordId=${record.id}&date=${new Date().format('hhmmssDDMMyyyy')}" - data-pk="${record.id}" data-url="/nibras/operation/quickSave2" + data-source="${request.contextPath}/operation/getQuickEditValues?entity=${entityCode}&field=${field}&recordId=${record.id}&date=${new Date().format('hhmmssDDMMyyyy')}" + data-pk="${record.id}" data-url="${request.contextPath}/operation/quickSave2" data-title="Edit ${field}"> ${record.recordId && record.recordId != 'null' && record.entityCode == 'W' ? Writing.get(record.recordId.toLong()) : 'w'} @@ -1128,8 +1128,8 @@ data-value="${record[field]?.id}" data-name="${field}-${entityCode}" style="border-bottom: 0.5px solid #808080; border-radius: 3px; font-size: 12px; font-style: italic; padding-left: 1px; padding-right: 1px;" - data-source="/nibras/operation/getQuickEditValues?entity=${entityCode}&recordId=${record.id}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" - data-pk="${record.id}" data-url="/nibras/operation/quickSave2" + data-source="${request.contextPath}/operation/getQuickEditValues?entity=${entityCode}&recordId=${record.id}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" + data-pk="${record.id}" data-url="${request.contextPath}/operation/quickSave2" data-title="Edit ${field}"> ${record[field] ? (record[field]) : 'g'} @@ -1163,8 +1163,8 @@ data-value="${record[field]}" data-name="${field}-${entityCode}" style="border-bottom: 0.5px solid #808080; border-radius: 3px; font-size: 12px; font-style: italic; padding-left: 1px; padding-right: 1px;" - data-source="/nibras/operation/getQuickEditValues?entity=${entityCode}&recordId=${record.id}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" - data-pk="${record.id}" data-url="/nibras/operation/quickSave2" + data-source="${request.contextPath}/operation/getQuickEditValues?entity=${entityCode}&recordId=${record.id}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" + data-pk="${record.id}" data-url="${request.contextPath}/operation/quickSave2" data-title="Edit ${field}"> ${record[field] ? (record[field]) : "'"} @@ -1180,42 +1180,6 @@ - - - - - - %{--|| entityCode == 'N'--}% - %{----}% - %{--==--}% - %{----}% - - - out ↵ - - - - - - - cmp ↵ - - - - + onclick="jQuery('#${entityCode}Record${record.id}').load('${request.contextPath}/generics/increasePriority/${entityCode}${record.id}')"> p+ %{----}% @@ -1248,7 +1212,7 @@ %{----}% + onclick="jQuery('#${entityCode}Record${record.id}').load('${request.contextPath}/generics/decreasePriority/${entityCode}${record.id}')"> - @@ -1258,28 +1222,28 @@ value="${record.endDate}" style="background: lightgrey" title="Increase end date and, if not set, set it to tomorrow" - onclick="jQuery('#${entityCode}Record${record.id}').load('/nibras/generics/increaseEndDate/${entityCode}${record.id}')"> + onclick="jQuery('#${entityCode}Record${record.id}').load('${request.contextPath}/generics/increaseEndDate/${entityCode}${record.id}')"> e+ + onclick="jQuery('#${entityCode}Record${record.id}').load('${request.contextPath}/generics/makeEndDateToday/${entityCode}${record.id}')"> 0   + onclick="jQuery('#${entityCode}Record${record.id}').load('${request.contextPath}/generics/decreaseEndDate/${entityCode}${record.id}')"> -- + onclick="jQuery('#${entityCode}Record${record.id}').load('${request.contextPath}/generics/clearEndDate/${entityCode}${record.id}')"> - @@ -1393,8 +1357,8 @@ data-type="select" data-value="${record[field] ?: 0}" data-name="${field}-${record.entityCode()}" - data-source="/nibras/operation/getQuickEditValues?entity=${record.entityCode()}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" - data-pk="${record.id}" data-url="/nibras/operation/quickSave2" + data-source="${request.contextPath}/operation/getQuickEditValues?entity=${record.entityCode()}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" + data-pk="${record.id}" data-url="${request.contextPath}/operation/quickSave2" data-title="Edit ${field}"> +${record[field] ?: ''} @@ -1522,8 +1486,8 @@ data-value="${record[field]?.id}" data-name="${field}-${entityCode}" style=" border-radius: 3px; font-size: 12px; font-weight: bold;font-style: italic; padding-left: 1px; padding-right: 1px;" - data-source="/nibras/operation/getQuickEditValues?entity=${entityCode}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" - data-pk="${record.id}" data-url="/nibras/operation/quickSave2" + data-source="${request.contextPath}/operation/getQuickEditValues?entity=${entityCode}&field=${field}&date=${new Date().format('hhmmssDDMMyyyy')}" + data-pk="${record.id}" data-url="${request.contextPath}/operation/quickSave2" data-title="Edit ${field}"> ${record[field] ? record[field]?.code : '?'} @@ -1550,7 +1514,7 @@ + onclick="jQuery('#${entityCode}Record${record.id}').load('${request.contextPath}/generics/quickBookmark/${entityCode}-${record.id}')"> @@ -1559,7 +1523,7 @@ + onclick="jQuery('#${entityCode}Record${record.id}').load('${request.contextPath}/generics/quickBookmark/${entityCode}-${record.id}')"> @@ -1575,7 +1539,7 @@ title="Select record" value="${org.springframework.web.context.request.RequestContextHolder.currentRequestAttributes().getSession()[entityCode + record.id] == 1}" style="height: 14px !important;" - onclick="jQuery('#selectBasketRegion').load('/nibras/generics/select/${entityCode}${record.id}')" + onclick="jQuery('#selectBasketRegion').load('${request.contextPath}/generics/select/${entityCode}${record.id}')" /> %{----}% diff --git a/grails-app/views/import/_importLocalFiles.gsp b/grails-app/views/import/_importLocalFiles.gsp index 7b24934..02ffc49 100644 --- a/grails-app/views/import/_importLocalFiles.gsp +++ b/grails-app/views/import/_importLocalFiles.gsp @@ -48,7 +48,7 @@ @@ -91,7 +91,7 @@ + + + + + + + %{--|| entityCode == 'N'--}% + %{----}% + %{--==--}% + %{----}% + + + out ↵ + + + + + + + cmp ↵ + + + + +   - // $.address.state('/nibras/') + // $.address.state('${request.contextPath}/') $.address.externalChange(function (event) { // do something depending on the event.value property, e.g. // $('#content').load(event.value + '.xml'); @@ -222,10 +222,10 @@ W${c.get(Calendar.WEEK_OF_YEAR)} / ${new Date().format("E")} // increaseArea: '-20%' // optional // }); -// jQuery('#searchForm').load('/nibras/generics/hqlSearchForm/T') - jQuery('#tagCloud').load('/nibras/reports/tagCloud') +// jQuery('#searchForm').load('${request.contextPath}/generics/hqlSearchForm/T') + jQuery('#tagCloud').load('${request.contextPath}/reports/tagCloud') -// jQuery('#centralArea').load('/nibras/generics/recentRecords') +// jQuery('#centralArea').load('${request.contextPath}/generics/recentRecords') // jQuery('#quickAddTextField').select(); // jQuery('#quickAddTextField').focus(); @@ -298,12 +298,12 @@ $("#accordionCenter").accordion({ jQuery.idleTimeout('#idletimeout', '#idletimeout a', { idleAfter: 10, pollingInterval: 10, - keepAliveURL: '/nibras/page/heartbeat', + keepAliveURL: '${request.contextPath}/page/heartbeat', serverResponseEquals: 'ok', onIdle: function () { jQuery.ajax({ type: 'GET', - url: '/nibras/page/heartbeat', + url: '${request.contextPath}/page/heartbeat', dataType: 'html', success: function(html, textStatus) { // jQuery('body').append(html); @@ -321,7 +321,7 @@ $("#accordionCenter").accordion({ // confirm('Your session has timeout.'); jQuery.ajax({ type: 'GET', - url: '/nibras/page/heartbeat', + url: '${request.contextPath}/page/heartbeat', dataType: 'html', success: function(html, textStatus) { // jQuery('body').append(html); @@ -338,14 +338,14 @@ $("#accordionCenter").accordion({ jQuery.idleTimeout('#importFileCount','#importFileCount', { idleAfter: 10, pollingInterval: 15, - keepAliveURL: '/nibras/page/importbeat', + keepAliveURL: '${request.contextPath}/page/importbeat', serverResponseEquals: 'ok', AJAXTimeout: 5, onTimeout: function () { // confirm('Your session has timeout.'); jQuery.ajax({ type: 'GET', - url: '/nibras/page/importbeat', + url: '${request.contextPath}/page/importbeat', dataType: 'html', success: function(html, textStatus) { jQuery('#importFileCount').text(html); @@ -355,11 +355,11 @@ $("#accordionCenter").accordion({ } }); - jQuery('#contactPanel').load('/nibras/generics/contactCloud'); - jQuery('#tagsPanel').load('/nibras/generics/tagCloud'); - jQuery('#importFileCount').load('/nibras/page/importbeat'); - jQuery('#recentRecordsCount').load('/nibras/generics/countRecentRecords'); - jQuery('#centralArea').load('/nibras/generics/recentRecords'); + jQuery('#contactPanel').load('${request.contextPath}/generics/contactCloud'); + jQuery('#tagsPanel').load('${request.contextPath}/generics/tagCloud'); + jQuery('#importFileCount').load('${request.contextPath}/page/importbeat'); + jQuery('#recentRecordsCount').load('${request.contextPath}/generics/countRecentRecords'); + jQuery('#centralArea').load('${request.contextPath}/generics/recentRecords'); Mousetrap.bindGlobal('ctrl+1', function (e) { jQuery('#accordionCenter').accordion({ active: 0}); diff --git a/grails-app/views/page/main-old.gsp b/grails-app/views/page/main-old.gsp index fdf7d45..d6a8bd8 100644 --- a/grails-app/views/page/main-old.gsp +++ b/grails-app/views/page/main-old.gsp @@ -214,7 +214,7 @@ // increaseArea: '-20%' // optional // }); -// jQuery('#searchForm').load('/nibras/generics/hqlSearchForm/T') +// jQuery('#searchForm').load('${request.contextPath}/generics/hqlSearchForm/T') // jQuery('#quickAddTextField').select(); // jQuery('#quickAddTextField').focus(); diff --git a/grails-app/views/page/record.gsp b/grails-app/views/page/record.gsp index 44558f0..f332196 100644 --- a/grails-app/views/page/record.gsp +++ b/grails-app/views/page/record.gsp @@ -368,7 +368,7 @@
T* @${d.code}
 + onclick='jQuery("#OrderTheFields").load("http://localhost:2008${request.contextPath}/operation/orderIcdInWrt?type=W&child=N&tableId=1", jQuery("#table1").tableDnDSerialize())'/>