Commit c5d41edc authored by Dave Cooper's avatar Dave Cooper
Browse files

ready to push this branch for backup

parent c2442c17
......@@ -18,25 +18,15 @@
(main-sheet-body (with-cl-who-string ()
(:div :id "content"
(:script :src "/timer-static/scripts.js")
(:script :type "text/javascript"
"function timerStop() {"
(str (the (gdl-ajax-call
:form-controls (list
(the timer-form-min)
(the timer-form-sec)
(the journal-form-name)
(the journal-form-descr))
:function-key :record-journal-entry)))
"}")
(str (the timer-header main-div))
(str (the timer-form-min form-control))
(str (the timer-form-sec form-control))
(:br)
(str (the timer-button main-div))
(:hr)
(str (the journal-form-name form-control))
(str (the journal-form-descr form-control))
(str (the timer-button main-div))
(str (the journal-button main-div))
(:br)
(str (the journal-entries-display main-div)))))
(additional-header-content
......@@ -68,20 +58,31 @@
; Button that says "START"
(timer-button :type 'sheet-section
:inner-html (with-cl-who-string ()
(:button :onclick
((:button :onclick
(concatenate 'string
"timerStart('"
(symbol-name (the timer-form-min id))
"','"
(symbol-name (the timer-form-sec id))
"')")
"')"))
"Start")))
(journal-button :type 'sheet-section
:inner-html (with-cl-who-string ()
((:button :onclick (the (gdl-ajax-call
:form-controls (list (the timer-form-min)
(the timer-form-sec)
(the journal-form-name)
(the journal-form-descr))
:function-key :record-journal-entry)))
"Record entry")))
; Displays journal entries
(journal-entries-display :type 'sheet-section
:inner-html (progn (the force-update-flag)
(with-cl-who-string ()
(fmt "Previous entries: ~{~a<br>~}"
(the read-journal-entry))))))
:functions
((read-journal-entry ()
......
......@@ -41,7 +41,7 @@ function countDown() {
document.getElementById(min_id).value = start_min;
document.getElementById(sec_id).value = start_sec;
timerStop();
alert('Please record your journal entry for this time.');
return;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment