X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/ae09804af7bb83aca901663108c8b05d5cfa3e3a..e8e743d7170e308377c728ab1ce41b752317b1ec:/src/mewa/mewa.lisp

diff --git a/src/mewa/mewa.lisp b/src/mewa/mewa.lisp
index a264756..e440551 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,13 +90,26 @@ 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))
-  (append (mapcar #'(lambda (s) (cons (car s) (gen-pslot (if (meta-model:foreign-key-p model (car s))
-						   (cadr s))
-						 (string (car s)) (car s)))) 
-	  (meta-model:list-slot-types model))
-	  (mapcar #'(lambda (s) (cons s (append (gen-pslot 'ucw::has-many (string s) s) `(:presentation (make-presentation ,model :type :one-line)))))
+  "return the default attributes for a given model using the meta-model's meta-data"
+  (append (mapcar #'(lambda (s) 
+		      (cons (car s) 
+			    (gen-pslot 
+			     (if (meta-model:foreign-key-p model (car s))
+				 'ucw::foreign-key
+				 (cadr s))
+			     (string (car s)) (car s)))) 
+		  (meta-model:list-slot-types model))
+	  (mapcar #'(lambda (s) 
+		      (cons s (append (gen-pslot 'ucw::has-many (string s) s) 
+				      `(:presentation 
+					(make-presentation 
+					 ,model 
+					 :type :one-line)))))
 		  (meta-model:list-has-many model))))
 
 (defmethod set-default-attributes ((model t))
@@ -255,25 +275,25 @@ 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)))
 
-
-
 (defaction cancel-save-instance ((self mewa))
-  (answer nil))
+  (cond  
+    ((slot-value (instance self) 'clsql-sys::view-database)
+      (meta-model::update-instance-from-records (instance self))
+      (answer self))
+    (t (answer nil))))
 
 (defaction save-instance ((self mewa))
-  (meta-modqel:sync-instance (instance self))
+  (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))
+(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 
@@ -283,11 +303,18 @@ attributes is an alist keyed on the attribute nreeame."
 	(: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)
@@ -297,4 +324,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  (type-of new) (type-of old) (type-of value) slot instance )))))))
+
+
+;; 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.