X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/1e936a4d6201432cbb347ee621377523749c6b65..2b0fd9c886908c6492c66cc30fcacf5fd600bf8e:/src/slot-presentations.lisp

diff --git a/src/slot-presentations.lisp b/src/slot-presentations.lisp
index 4dcbecc..2f75737 100644
--- a/src/slot-presentations.lisp
+++ b/src/slot-presentations.lisp
@@ -1,5 +1,11 @@
+;; i know this is horrible, but it works wonders.
+(declaim (optimize (speed 0) (space 3) (safety 0)))
+
+
 (in-package :lisp-on-lines)
 
+
+;;;; I dont think i'm using these anymore.
 (defun multiple-value-funcall->list (function &rest args)
   "The function to be called by m-v-bf"
 		   (multiple-value-call #'list (apply function args)))
@@ -16,10 +22,24 @@
 (defslot-presentation text-slot-presentation ()
   ((rows :initarg :rows :accessor rows :initform 5)
    (columns :initarg :columns :accessor columns :initform 40)
-   (escape-html-p :initarg :escape-html-p :accessor escape-html-p :initform nil))
+   (escape-html-p :initarg :escape-html-p :accessor escape-html-p :initform nil)
+   (convert-newlines-p :initarg :convert-newlines-p :accessor convert-newlines-p :initform nil))
   (:type-name text))
 
 (defmethod present-slot ((slot text-slot-presentation) instance)
+  (flet ((maybe-convert-newline-and-escape-html-then-print ()
+	   (let ((string (if (convert-newlines-p slot)
+			     (with-output-to-string (new-string)
+			       (with-input-from-string
+				   (s (presentation-slot-value slot instance))
+				 (loop for line = (read-line s nil)
+				       while line
+				       do (format new-string "~A~A" line "<br/>"))))
+			     (presentation-slot-value slot instance))))
+	     (if (escape-html-p slot)
+		 (<:as-html string)
+		 (<:as-is string)))))
+    
     (if (editablep slot)
 	(<ucw:textarea
 	 :accessor (presentation-slot-value slot instance)
@@ -27,13 +47,13 @@
 		 "")
 	 :rows (rows slot)
 	 :cols (columns slot))
-	(if (escape-html-p slot)
-	    (<:as-html (presentation-slot-value slot instance))
-	    (<:as-is (presentation-slot-value slot instance)))))
+	(when (presentation-slot-value slot instance)
+	  (maybe-convert-newline-and-escape-html-then-print)))))
 
 
 (defcomponent mewa-slot-presentation ()
-  ((slot-name :accessor slot-name 
+  ((validate-functions :accessor validate-functions :initform (list (constantly t)))
+   (slot-name :accessor slot-name 
 	      :initarg :slot-name 
 	      :documentation 
 	      "The name of the slot being accessed")
@@ -47,6 +67,8 @@ When T, only the default value for primary keys and the joins are updated.")
    (creatablep :accessor creatablep :initarg :creatablep :initform t))
   (:documentation "The superclass of all Mewa slot presentations"))
 
+
+
 ;;;; this has to be in the eval when i would think
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defun generate-slot-presentation-definition-for-type (type)
@@ -72,32 +94,38 @@ When T, only the default value for primary keys and the joins are updated.")
 
 (defslot-presentation clsql-wall-time-slot-presentation (mewa-relation-slot-presentation)
        ((input-id :accessor input-id :initform (arnesi:random-string 10 arnesi:+ascii-alphabet+))
-	(trigger-id :accessor trigger-id :initform (arnesi:random-string 10 arnesi:+ascii-alphabet+)))
+	(trigger-id :accessor trigger-id :initform (arnesi:random-string 10 arnesi:+ascii-alphabet+))
+	(default-to-now-p :accessor default-to-now-p :initarg :default-to-now-p :initform nil))
        (:type-name clsql-sys:wall-time))
 
-(defmethod presentation-slot-value ((slot clsql-wall-time-slot-presentation) instance)
+(defmethod lol::presentation-slot-value ((slot clsql-wall-time-slot-presentation) instance)
   (let ((date (call-next-method)))
     (when date (multiple-value-bind (y m d) (clsql:time-ymd date)
       (format nil "~a/~a/~a" m d y)))))
 
-(defmethod (setf presentation-slot-value) ((value string) (slot clsql-wall-time-slot-presentation) instance)
+(defmethod (setf lol::presentation-slot-value) ((value string) (slot clsql-wall-time-slot-presentation) instance)
   (let ((new-time (clsql:parse-date-time (remove #\Space value)))
 	(old-time (when (slot-boundp instance (slot-name slot))
 		    (slot-value instance (slot-name slot)))))
     (unless (or (eql old-time new-time)
 		(when (and new-time old-time)
 		  (equal :equal (clsql:time-compare new-time old-time))))
-    (setf (presentation-slot-value slot instance) new-time ))))
+    (setf (presentation-slot-value slot instance) new-time))))
 
 (defmethod label :around ((slot clsql-wall-time-slot-presentation))
   (concatenate 'string (call-next-method) "  (m/d/y)"))
 
-(defmethod present-slot ((slot clsql-wall-time-slot-presentation) instance)
-  (let ((date (presentation-slot-value slot instance)))
+(defmethod lol::present-slot ((slot clsql-wall-time-slot-presentation) instance)
+  (let ((date (lol::presentation-slot-value slot instance)))
+    ;; Default values
+    (when (and (not date) (default-to-now-p slot))
+      (setf (lol::presentation-slot-value slot instance) (clsql:get-time)))
+    ;;simple viewer
     (if (and date (not (editablep slot)))
 	(<:as-html date))
+    ;; editor
     (when (editablep slot)
-      (<ucw:input :accessor (presentation-slot-value slot instance) :id (input-id slot) :style "display:inline")
+      (<ucw:input :accessor (lol::presentation-slot-value slot instance) :id (input-id slot) :style "display:inline")
       (<:button :id (trigger-id slot) (<:as-html "[...]"))
       (<:script :type "text/javascript" 
 		(<:as-is (format nil " 
@@ -189,11 +217,10 @@ Calendar.setup({
   ;; the viewed instance could have been changed/deleted, so we sync this instance
   (meta-model:sync-instance (instance (ucw::parent self))))
 
-
 (defmethod  present-slot :around ((slot foreign-key-slot-presentation) instance)  
   (setf (foreign-instance slot) 
-	(when (presentation-slot-value slot instance) 
-	  (meta-model:explode-foreign-key instance (slot-name slot))))
+	(when (lol::presentation-slot-value slot instance) 
+	  (meta-model:explode-foreign-key instance (slot-name slot) :nilp t)))
   (flet ((render () (when (foreign-instance slot)(call-next-method))))
     (if (slot-boundp slot 'ucw::place)
         (cond 
@@ -211,7 +238,8 @@ Calendar.setup({
 
 
 (defmethod find-foreign-instances ((slot foreign-key-slot-presentation))
-  (clsql:select (class-name (class-of (meta-model:explode-foreign-key (instance slot) (slot-name slot))))))
+  (clsql:select (class-name (class-of (meta-model:explode-foreign-key (instance slot) (slot-name slot))))
+		:order-by (car (list-keys (instance slot)))))
 
 
 
@@ -272,9 +300,10 @@ Calendar.setup({
 		       
 
 (defmethod get-foreign-instances ((slot has-many-slot-presentation) instance)
-  (slot-value instance (slot-name slot)))
+  (sort (slot-value instance (slot-name slot)) #'<  
+	:key #'(lambda (x) (funcall (car (list-keys x)) x))))
 
-(defmethod presentation-slot-value ((slot has-many-slot-presentation) instance)
+(defmethod lol::presentation-slot-value ((slot has-many-slot-presentation) instance)
   (get-foreign-instances slot instance))
 
 (defslot-presentation has-very-many-slot-presentation (has-many-slot-presentation)
@@ -335,36 +364,38 @@ Calendar.setup({
 		:flatp t))
 
 (defmethod present-slot ((slot has-a-slot-presentation) instance)
-;      (<:as-html (presentation-slot-value slot instance))
+;      (<:as-html (lol::presentation-slot-value slot instance))
   (if (editablep slot)
-      (progn (<ucw:select :accessor (presentation-slot-value slot instance) :test #'equalp
+      (progn (<ucw:select :accessor (lol::presentation-slot-value slot instance) :test #'equalp
         (when (allow-nil-p slot)
 	  (<ucw:option :value nil (<:as-html "none")))
 	(dolist (option (get-foreign-instances slot instance))
 	  (<ucw:option :value (find-foreign-slot-value slot option)
-		       (lol:present
-			(lol:make-presentation option
+		       (lol::present
+			(lol::make-presentation option
 			   :type :as-string
 			   :initargs
 			   `(:attributes ,(attributes slot)))
 			))))
 	     (when (creatablep slot)
 	       (<ucw:submit :action  (create-record-on-foreign-key slot instance) :value "Add New" :style "display:inline"))) 
-      (if (presentation-slot-value slot instance)
+      (if (lol::presentation-slot-value slot instance)
 	  (progn
-	   (lol:present
+	   (lol::present
 	    (lol:make-presentation (meta-model:explode-foreign-key instance (slot-name slot))
 			   :type :one-line
 			   :initargs
 			   `(:attributes ,(attributes slot)))
 			   ))
-	  (<:as-html "--"))))
+	   (<:as-html "--"))))
 
 (defslot-presentation many-to-many-slot-presentation (mewa-relation-slot-presentation)
   ((list-view :accessor list-view :initarg :list-view :initform :one-line)
    (action-view :accessor action-view :initarg :action-view :initform :viewer)
    (create-view :initform :creator)
-   (select-view :initform :as-string :accessor select-view))
+   (select-view :initform :as-string :accessor select-view)
+   (can-add-new-p :initarg :can-add-new-p :accessor can-add-new-p :initform t)
+   (can-add-existing-p :initarg :can-add-existing-p :accessor can-add-existing-p :initform t))
   (:type-name many-to-many)
   (:default-initargs :label "many to many"))
 
@@ -400,22 +431,26 @@ Calendar.setup({
   (let ((instances (slot-value instance (slot-name slot)))
 	new-instance)
     (<:ul
-     (<:li (<ucw:button :action (add-to-many-to-many slot instance)
-			 (<:as-html "Add New")))
-     (<:li  (<ucw:button :action (add-to-many-to-many slot instance new-instance)
-			 (<:as-html "Add:"))
-	    (<ucw:select :accessor new-instance
-			 (arnesi:dolist* (i (find-all-instances slot instance))
-			   (<ucw:option
-			    :value i
-			    (lol:present-view (i (select-view slot) slot))))))
+     (when (can-add-new-p slot)
+       (<:li 
+	(<ucw:submit :action (add-to-many-to-many slot instance)
+			
+		     :value "Add New")))
+     (when (can-add-existing-p slot )
+       (<:li  (<ucw:submit :action (add-to-many-to-many slot instance new-instance)
+			   :value "Add:")
+	      (<ucw:select :accessor new-instance
+			   (arnesi:dolist* (i (find-all-instances slot instance))
+			     (<ucw:option
+			      :value i
+			      (lol:present-view (i (select-view slot) slot)))))))
      (dolist* (i instances)
        (<:li
 	(<ucw:a :action (call-view ((car i) (action-view slot) (ucw::parent slot)))
 		(<:as-html "(view) "))
 	(<ucw:a :action (delete-relationship slot (second i) instance)
 		(<:as-html "(remove) "))
-	(present-view ((car i) (list-view slot) (ucw::parent slot)))) ))))
+	(present-view ((car i) (list-view slot) (ucw::parent slot))))))))
 
 
 (defaction add-to-many-to-many ((slot many-to-many-slot-presentation) instance &optional foreign-instance)