Changeset 127 for trunk/grails-app/domain

Timestamp:

May 6, 2009, 3:40:07 AM (16 years ago)

Author:

gav

Message:

Logins now route through a welcome action to allow flash message and user environment setup. Session timeout now user configurable and defaults to 12 hours. Work on Planned Maintenance.

Location:

trunk/grails-app/domain

Files:

• MaintenanceAction.groovy (modified) (3 diffs)
• Person.groovy (modified) (2 diffs)
• RecurringSchedule.groovy (modified) (2 diffs)

trunk/grails-app/domain/MaintenanceAction.groovy

@@ -1 @@
-class MaintenanceAction {
+class TaskAction {
+    Task task
     MaintenancePolicy maintenancePolicy
-    PlannedMaintenance plannedMaintenance
     SystemSection systemSection
     Asset asset
@@ -8 +8 @@
     SubAssembly subAssembly
     ComponentItem componentItem
-    String maintenanceAction
+    String action
     String reasoning = ""
-    Integer pmStepNumber
+    Integer stepNumber
     boolean isActive = true
 
 //     static hasMany = []
 
-    static belongsTo = [PlannedMaintenance]
+//     static belongsTo = []
 
     static constraints = {
@@ -24 +24 @@
         subAssembly(blank:true, nullable:true)
         componentItem(blank:true, nullable:true)
-        pmStepNumber(blank:true, nullable:true)
+        stepNumber(blank:true, nullable:true)
     }
 

trunk/grails-app/domain/Person.groovy

@@ -13 +13 @@
     String lastName
     String employeeID
+
+    /* Set after login by 'welcome' action, default to 12 hours, aka "sess.setMaxInactiveInterval(seconds) */
+    Integer sessionTimeout = 720
 
         /** MD5 Password */
@@ -42 +45 @@
         //So we need to use pass for validation then encode it for above.
         pass(blank: false, minSize:4)
+        sessionTimeout(min:60, max:720)
 
         }

trunk/grails-app/domain/RecurringSchedule.groovy

@@ -1 @@
-class RecurringSchedule {
+class TaskRecurringSchedule {
 
     Task task
+//     Task lastGeneratedSubTask
     Period period
-    PlannedMaintenance plannedMaintenance
 
     Integer recurEvery
     Date startDate = new Date()
-    Date lastExecutedDate
+    Date lastGeneratedDate
     Date nextDueDate
     boolean isActive = true
@@ -16 +16 @@
 
     static constraints = {
-        plannedMaintenance(blank:true, nullable:true)
-        lastExecutedDate(blank:true, nullable:true)
+//         lastGeneratedDate(blank:true, nullable:true)
     }