simon/adl
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Improvements to page/form/list generation

Browse source
This commit is contained in:
Simon Brooke 2018-06-11 10:13:44 +01:00
parent 1338b54846
commit 7c9f7f91b4
2 changed files with 109 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
src/adl/to_selmer_templates.clj
View file

@ -12,7 +12,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;
;;;; adl.to-selmer-templates.
;;;; adl.to-selmer-templates. Generate Web 1.0 style user interface.
;;;;
;;;; This program is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU General Public License
@ -58,24 +58,64 @@
[content])}]})
(defn emit-content
([filename application k]
(emit-content filename nil nil application k))
([filename spec entity application k]
(let [content (:content
(first
(or (children-with-tag spec k)
(children-with-tag entity k)
(children-with-tag
(first
(children-with-tag application :content))
k))))]
(if
content
(list
(str "{% block " (name k) " %}")
(map
#(with-out-str (x/emit-element %))
content)
"{% endblock %}")))))
(defn file-header
"Generate a header for a template file."
[filename]
(str
"{% extends \"templates/base.html\" %}\n\n"
"<!-- File "
"Generate a header for a template file with this `filename` for this `spec`
of this `entity` within this `application`."
([filename application]
(file-header filename nil nil application))
([filename spec entity application]
(s/join
"\n"
(flatten
(list
"{% extends \"templates/base.html\" %}"
(str "<!-- File "
filename
" generated "
(t/now)
" by adl.to-selmer-templates.\n"
"See [Application Description Language](https://github.com/simon-brooke/adl)."
"-->\n\n"
"{% block content %}"))
"-->")
(emit-content filename spec entity application :head)
(emit-content filename spec entity application :top)
"{% block content %}")))))
(defn file-footer
"Generate a header for a template file."
[filename]
"{% endblock %}\n")
"Generate a footer for a template file with this `filename` for this `spec`
of this `entity` within this `application`."
([filename application]
(file-footer filename nil nil application))
([filename spec entity application]
(s/join
"\n"
(flatten
(list
"{% endblock %}"
(emit-content filename spec entity application :foot)
)))))
(defn prompt
@ -347,7 +387,7 @@
:content
(apply
vector
(concat
(map
(fn [f]
(let [property (first
@ -359,18 +399,26 @@
:tag :th
:content
[{:tag :input
:attrs {:id (:property (:attrs f))
:type (case (:type (:attrs property))
("integer" "real" "money") "number"
("date" "timestamp") "date"
"time" "time"
"text")
:attrs {:id (:property (:attrs f))
:name (:property (:attrs f))
:value (str "{{ params." (:property (:attrs f)) " }}")}}])))
(fields list-spec)))}]})
(fields list-spec))
'({:tag :th
:content
[{:tag :input
:attrs {:type "submit"
:id "search"
:value "Search"}}]})))}]})
(defn- list-tbody
"Return a table body element for the list view for this `list-spec` of this `entity` within
this `application`."
[list-spec entity application]
{:tag :tbody
:content
@ -390,6 +438,7 @@
:attrs
{:href
(str
"{{servlet-context}}/"
(editor-name entity application)
"?"
(s/join
@ -402,6 +451,35 @@
"{% endfor %}"]})
(defn- list-page-control
"What this needs to do is emit an HTML control which, when selected, requests the
next or previous page keeping the same search parameters; so it essentially needs
to be a submit button, not a link."
[forward?]
{:tag :div
:attrs {:class (if forward? "big-link-container" "back-link-container")}
:content
[{:tag :input
:attrs {:id "page"
:name "page"
:disabled (if
forward?
false
"{% ifequal offset 0 %} false {% else %} true {% endifequal %}")
;; TODO: real thought needs to happen on doing i18n for this!
:value (if forward? "Next" "Previous")}}]})
(defn- list-tfoot
"Return a table footer element for the list view for this `list-spec` of this `entity` within
this `application`."
[list-spec entity application]
{:tag :tfoot
:content
[(list-page-control false)
(list-page-control true)]})
(defn- list-to-template
"Generate a template as specified by this `list` element for this `entity`,
taken from this `application`. If `list` is nill, generate a default list
@ -416,12 +494,7 @@
:content
[(list-thead list-spec entity application)
(list-tbody list-spec entity application)
{:tag :tfoot}]}
"{% if offset > 0 %}"
(back-link "Previous" "FIXME")
"{% endif %}"
(big-link "Next" "FIXME")
(big-link (str "Add a new " (pretty-name entity)) (editor-name entity application))]})
(list-tfoot list-spec entity application)]}]})
(defn entity-to-templates
@ -498,7 +571,7 @@
(defn write-template-file
[filename template]
[filename template application]
(if
template
(try
@ -507,10 +580,10 @@
(s/join
"\n"
(list
(file-header filename)
(file-header filename application)
(with-out-str
(x/emit-element template))
(file-footer filename))))
(file-footer filename application))))
(catch Exception any
(spit
(str *output-path* filename)
@ -542,7 +615,7 @@
(templates-map %)
(let [filename (str (name %) ".html")]
(try
(write-template-file filename (templates-map %))
(write-template-file filename (templates-map %) application)
(catch Exception any
(str
"Exception "

8
src/adl/utils.clj
View file

@ -196,9 +196,12 @@
(defn children-with-tag
"Return all children of this `element` which have this `tag`."
"Return all children of this `element` which have this `tag`;
if `element` is `nil`, return `nil`."
[element tag]
(children element #(= (:tag %) tag)))
(if
element
(children element #(= (:tag %) tag))))
(defmacro properties
"Return all the properties of this `entity`."
@ -223,6 +226,7 @@
[property]
(and
(= (:tag property) :property)
(not (#{"link"} (:type (:attrs property))))
(not (= (:distinct (:attrs property)) "system"))))
(defmacro all-properties