added better equality checks for clsql-wall-time slot changes

[clinton/lisp-on-lines.git] / src / mewa / presentations.lisp

diff --git a/src/mewa/presentations.lisp b/src/mewa/presentations.lisp
index 3763c27..dd68185 100644 (file)
--- a/src/mewa/presentations.lisp
+++ b/src/mewa/presentations.lisp
@@ -11,9 +11,29 @@
 ;;;objects
 (defcomponent mewa-object-presentation (mewa ucw:object-presentation) ())
 
+(defcomponent two-column-presentation (mewa-object-presentation) ())
+
+(defmethod present ((pres two-column-presentation))
+  
+  (<:table :class (css-class pres)
+          (loop for slot on (slots pres) by #'cddr
+                do 
+                (<:tr :class "presentation-slot-row"
+                      (<:td :class "presentation-slot-label" 
+                            (<:as-html (label (first slot))))
+                      (<:td :class "presentation-slot-value" 
+                            (present-slot (first slot) (instance pres)))
+                      (when (second slot)
+                        (<:td :class "presentation-slot-label" 
+                              (<:as-html (label (second slot))))
+                        (<:td :class "presentation-slot-value" 
+                              (present-slot (second slot) (instance pres))))))
+          (render-options pres (instance pres))))
+
+
 ;;;lists
 (defcomponent mewa-list-presentation (mewa ucw:list-presentation) 
-  ((instances :accessor instances :initarg :instances :initform nil)
+  ((ucw::instances :accessor instances :initarg :instances :initform nil)
    (instance :accessor instance)
    (select-label :accessor select-label :initform "select" :initarg :select-label)
    (selectablep :accessor selectablep :initform t :initarg :selectablep)))
@@ -42,9 +62,32 @@
                      :value (select-label listing)))))
     (dolist (slot (slots listing))
       (<:td :class "data-cell" (present-slot slot object)))
-    (<:td :class "index-number-cell"
-      (<:i (<:as-html index)))
+    (<:td :class "index-number-cell")
     ))
 
 (defmethod get-all-instances ((self mewa-list-presentation))
   (instances self))
+
+
+;;; searching
+
+(defcomponent mewa-presentation-search (ucw::presentation-search) 
+ ((display-results-p :accessor display-results-p :initarg :display-results-p :initform nil)))
+
+(defmethod ok ((self mewa-presentation-search) &optional arg)
+  (declare (ignore arg))
+  (setf (display-results-p self) t))
+
+(defmethod get-all-instances ((self mewa-presentation-search))
+  (clsql:select (class-name (class-of (instance (ucw::search-presentation self)))) :flatp t))
+
+(defmethod render-on ((res response) (self mewa-presentation-search))
+  (ucw::render-criteria res self)
+  (when (display-results-p self)
+    (let ((listing (ucw::list-presentation self))) 
+      (setf (instances listing ) (ucw::valid-instances self)
+           (slot-value listing 'ucw::calling-component) (slot-value self 'ucw::calling-component)
+           (slot-value listing 'ucw::place) (slot-value self 'ucw::place)
+           (slot-value listing 'ucw::continuation) (slot-value self 'ucw::continuation))
+    
+      (render-on res listing))))
\ No newline at end of file