Merge branch 'main' of git.sr.ht:~marcuskammer/dev.metalisp.survey

This commit is contained in:
Marcus Kammer 2024-06-05 12:00:13 +02:00
commit b69e9d9f22
2 changed files with 7 additions and 9 deletions

View file

@ -6,19 +6,17 @@
(survey (make-survey uri))) (survey (make-survey uri)))
(and (= (length parts) 3) (and (= (length parts) 3)
(string= (first parts) "survey") (string= (first parts) "survey")
(and (funcall survey 'id) (funcall survey 'id)
(every #'digit-char-p (second parts)))
(search "submit" (third parts))))) (search "submit" (third parts)))))
(defun questionnaire-submit-uri (request) (defun questionnaire-submit-uri (request)
(questionnaire-submit-uri-p (request-uri request))) (questionnaire-submit-uri-p (request-uri request)))
(defun ensure-data-file-exist (id &optional lang) (defun ensure-data-file-exist (survey-id)
(ensure-directories-exist (format nil "~a~a/~a-~a.lisp" (ensure-directories-exist (format nil "~a~a/~a.lisp"
*survey-data-dir* *survey-data-dir*
id survey-id
(generate-uuid) (generate-uuid))))
lang)))
(define-easy-handler (questionnaire-submit :uri #'questionnaire-submit-uri) nil (define-easy-handler (questionnaire-submit :uri #'questionnaire-submit-uri) nil
(let ((post-params (post-parameters* *request*)) (let ((post-params (post-parameters* *request*))

View file

@ -12,7 +12,7 @@
(defun questionnaire-uri (request) (defun questionnaire-uri (request)
(questionnaire-uri-p (request-uri request))) (questionnaire-uri-p (request-uri request)))
(defun return-sus-form (lang) (defun choose-sus-form (lang)
"Based on LANG decide which sus form to show." "Based on LANG decide which sus form to show."
(check-type lang string) (check-type lang string)
(cond ((string= lang "en") #'ml-survey/views:sus-form-en) (cond ((string= lang "en") #'ml-survey/views:sus-form-en)
@ -22,4 +22,4 @@
(define-easy-handler (questionnaire :uri #'questionnaire-uri) (lang) (define-easy-handler (questionnaire :uri #'questionnaire-uri) (lang)
(let ((survey (make-survey (request-uri*)))) (let ((survey (make-survey (request-uri*))))
(setf *html-lang* lang) (setf *html-lang* lang)
(funcall (return-sus-form lang) (funcall survey 'id)))) (funcall (choose-sus-form lang) (funcall survey 'id))))