X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/19531fbd947da15a17f8e5557a1a1492eab2bca3..7129498f766e835230452e4d3e51f8235667646f:/src/mewa/mewa.lisp

diff --git a/src/mewa/mewa.lisp b/src/mewa/mewa.lisp
index 8509f2d..0164802 100644
--- a/src/mewa/mewa.lisp
+++ b/src/mewa/mewa.lisp
@@ -12,9 +12,7 @@
 ;;; some utilities for merging plists
 
 (defun plist-nunion (new-props plist)
-  (loop for cons on new-props
-	for i from 1
-	when (oddp i)
+  (loop for cons on new-props by #'cddr
 	do (setf (getf plist (first cons)) (second cons))
 	finally (return plist)))
 
@@ -87,8 +85,12 @@ attributes is an alist keyed on the attribute nreeame."
 
 
 (defmethod default-attributes ((model t))
-  (append (mapcar #'(lambda (s) (cons (car s) (gen-pslot (if (meta-model:foreign-key-p model (car s))
-						   'ucw::foreign-key
+  (append (mapcar #'(lambda (s) 
+		      (cons (car s) 
+			    (gen-pslot 
+			     (if (meta-model:foreign-key-p model
+							   'ucw::foreign-key
+							   (car s))
 						   (cadr s))
 						 (string (car s)) (car s)))) 
 	  (meta-model:list-slot-types model))
@@ -130,7 +132,8 @@ attributes is an alist keyed on the attribute nreeame."
     :accessor use-instance-class-p 
     :initform t)
    (initializedp :initform nil)
-   (modifiedp :accessor modifiedp :initform nil)))
+   (modifiedp :accessor modifiedp :initform nil)
+   (modifications :accessor modifications :initform nil)))
 
 
 (defmethod attributes :around ((self mewa))
@@ -217,13 +220,6 @@ attributes is an alist keyed on the attribute nreeame."
   (setf (slots self) (find-slot-presentations   self)))
   
 
-(defmethod render-on :around ((res response) (self mewa))
-  (unless (slot-value self 'initializedp)
-    (initialize-slots self))
-  (setf (slot-value self 'initializedp) t)
-  (call-next-method))
-
-
 (defmethod make-presentation ((object t) &key (type :viewer) (initargs nil))
   (let* ((p (make-instance 'mewa-object-presentation))
 	 (a (progn (setf (slot-value p 'instance) object)
@@ -249,6 +245,8 @@ attributes is an alist keyed on the attribute nreeame."
 					   type))
 				       (plist-union initargs (cddr a)))))
     (setf (slot-value i 'instance) object)
+    (initialize-slots i)
+    (setf (slot-value i 'initializedp) t)
     i))
 
 
@@ -265,4 +263,43 @@ attributes is an alist keyed on the attribute nreeame."
 			     (slots to))))
 
 (defmacro call-presentation (object &rest args)
-  `(present-object ,object :presentation (make-presentation ,object ,@args)))
\ No newline at end of file
+  `(present-object ,object :presentation (make-presentation ,object ,@args)))
+
+
+
+(defaction cancel-save-instance ((self mewa))
+  (answer nil))
+
+(defaction save-instance ((self mewa))
+  (meta-model:sync-instance (instance self))
+   (setf (modifiedp self) nil)
+       (answer self))
+
+
+(defaction ok ((self mewa) &optional arg)
+  "Returns the component if it has not been modified. if it has been, prompt user to save or cancel"
+  (declare (ignore arg))
+  (when (modifiedp self)
+    (let ((message (format nil "Record has been modified, Do you wish to save the changes?<br/> ~a" (print (modifications self)))))
+      (case (call 'option-dialog 
+		  :message message
+		  :options '((:save . "Save changes to Database")
+			     (:cancel . "Cancel all changes")))
+	(:cancel
+	 (cancel-save-instance self))
+	(:save 
+	 (save-instance self)))))
+  (answer self))
+
+
+
+(defmethod (setf presentation-slot-value) :around (value (slot slot-presentation) instance)
+  (let* ((old (prog1 
+		 (presentation-slot-value slot instance)
+	       (call-next-method)))
+	(new (presentation-slot-value slot instance)))
+  
+  (unless (equal new old )
+    (let ((self (ucw::parent slot)))
+      (setf (modifiedp self) instance
+	    (modifications self)  (append (list  (type-of new) (type-of old) (type-of value) slot instance )))))))
\ No newline at end of file