X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/1679abef7f7f18250837d49052d92e2f8ba2f6db..4e2ecf695f074d4ed79c1099fa56b1d6fce08bfb:/src/mewa/mewa.lisp

diff --git a/src/mewa/mewa.lisp b/src/mewa/mewa.lisp
index ba7d6d9..54ab29d 100644
--- a/src/mewa/mewa.lisp
+++ b/src/mewa/mewa.lisp
@@ -1,9 +1,16 @@
+
 (in-package :mewa)
  
 (defparameter *default-type* :ucw)
 
 ;;; maps meta-model slot-types to slot-presentation
-(defparameter *slot-type-map* '(number ucw:currency))
+(defparameter *slot-type-map*
+  '(boolean   ucw::mewa-boolean
+    string    ucw::mewa-string
+    number    ucw::mewa-currency
+    integer   ucw::mewa-integer
+    currency  ucw::mewa-currency
+    ))
 
 ;;; an alist of model-class-name . attributes
 ;;; should really be a hash-table.
@@ -27,7 +34,7 @@
   (mapcar #'(lambda (x) (gen-pslot (cadr x) 
 				   (string (car x)) 
 				   (car x))) 
-	  (list-slot-types instance)))
+	  (meta-model:list-slot-types instance)))
 
 
 (defun gen-pslot (type label slot-name)
@@ -83,6 +90,9 @@ attributes is an alist keyed on the attribute nreeame."
 			 (cddr (find-attribute model name))))
 	    definition)))
 
+(defmethod perform-set-attributes ((model t) definitions)
+  (dolist (def definitions)
+    (funcall #'set-attribute model (first def) (rest def))))
 
 (defmethod default-attributes ((model t))
   "return the default attributes for a given model using the meta-model's meta-data"
@@ -265,12 +275,18 @@ attributes is an alist keyed on the attribute nreeame."
   (setf (slots to) (mapcar #'(lambda (x) (prog2 
 					     (setf (component.place x) (component.place from))
 					     x))
-			     (slots to))))
+                            (slots to))))
 
 (defmacro call-presentation (object &rest args)
   `(present-object ,object :presentation (make-presentation ,object ,@args)))
 
 
+(defcomponent about-dialog (option-dialog)
+  ((body :initarg :body)))
+
+(defmethod render-on ((res response) (self about-dialog))
+  (render-on res (slot-value self 'body))
+  (call-next-method))
 
 (defaction cancel-save-instance ((self mewa))
   (cond  
@@ -285,23 +301,30 @@ attributes is an alist keyed on the attribute nreeame."
        (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))
+(defaction ensure-instance-sync ((self mewa))
   (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 
+      (case (call 'about-dialog
+                  :body (make-presentation (instance self) 
+					   :type :viewer)
 		  :message message
 		  :options '((:save . "Save changes to Database")
 			     (:cancel . "Cancel all changes")))
 	(:cancel
 	 (cancel-save-instance self))
 	(:save 
-	 (save-instance self)))))
+	 (save-instance 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))
+  (ensure-instance-sync self)
   (answer self))
 
 
 
+
+
 (defmethod (setf presentation-slot-value) :around (value (slot slot-presentation) instance)
   (let* ((old (prog1 
 		 (presentation-slot-value slot instance)
@@ -311,4 +334,12 @@ attributes is an alist keyed on the attribute nreeame."
   (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
+	    (modifications self)  (append (list new old value slot instance) (modifications self)))))))
+
+
+;; This software is Copyright (c) Drew Crampsie, 2004-2005.
+;; You are granted the rights to distribute
+;; and use this software as governed by the terms
+;; of the Lisp Lesser GNU Public License
+;; (http://opensource.franz.com/preamble.html),
+;; known as the LLGPL.