bknr-cvs November 2008

bknr-cvs@common-lisp.net

1 participants
79 discussions

[bknr-cvs] hans changed trunk/projects/bos/
by BKNR Commits 30 Nov '08

30 Nov '08

Revision: 4102 Author: hans URL: http://bknr.net/trac/changeset/4102 Improve map handling. Add infrastructure for sponsor queries. U trunk/projects/bos/m2/m2.lisp U trunk/projects/bos/m2/packages.lisp U trunk/projects/bos/payment-website/static/poi-ms.css U trunk/projects/bos/payment-website/static/poi-ms.js U trunk/projects/bos/web/packages.lisp U trunk/projects/bos/web/sponsor-handlers.lisp U trunk/projects/bos/web/webserver.lisp Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-11-29 21:55:51 UTC (rev 4101) +++ trunk/projects/bos/m2/m2.lisp 2008-11-30 10:29:40 UTC (rev 4102) @@ -712,8 +712,6 @@ (json:encode-object-elements "name" (user-full-name sponsor) "country" (or (sponsor-country sponsor) "sponsor-country-unknown") - "sqmCount" (reduce #'+ (mapcar (alexandria:compose #'length #'contract-m2s) (sponsor-contracts sponsor)) - :initial-value 0) "infoText" (sponsor-info-text sponsor)) (unless (user-full-name sponsor) (json:encode-object-element "anonymous" t)) @@ -723,10 +721,10 @@ (json:with-object () (json-encode contract)))))) -(defun last-sponsors-as-json () - "Render the last sponsors as JSON" +(defun sponsors-as-json (sponsors) + "Render the SPONSORS as JSON" (json:with-array () - (dolist (sponsor (mapcar #'contract-sponsor (last-paid-contracts))) + (dolist (sponsor sponsors) (json:with-object () (json-encode sponsor))))) Modified: trunk/projects/bos/m2/packages.lisp =================================================================== --- trunk/projects/bos/m2/packages.lisp 2008-11-29 21:55:51 UTC (rev 4101) +++ trunk/projects/bos/m2/packages.lisp 2008-11-30 10:29:40 UTC (rev 4102) @@ -171,7 +171,7 @@ #:contract-stats-for-country #:last-paid-contracts #:do-sponsor-countries - #:last-sponsors-as-json + #:sponsors-as-json #:make-m2-javascript #:recolorize-contracts Modified: trunk/projects/bos/payment-website/static/poi-ms.css =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.css 2008-11-29 21:55:51 UTC (rev 4101) +++ trunk/projects/bos/payment-website/static/poi-ms.css 2008-11-30 10:29:40 UTC (rev 4102) @@ -23,10 +23,14 @@ font-size: 180%; } +.map img { + vertical-align: bottom; /* align images without space for character descenders */ +} + .map { position: relative; } -.map .icon { +.map .icon, .map .contract { position: absolute; } Modified: trunk/projects/bos/payment-website/static/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.js 2008-11-29 21:55:51 UTC (rev 4101) +++ trunk/projects/bos/payment-website/static/poi-ms.js 2008-11-30 10:29:40 UTC (rev 4102) @@ -72,7 +72,7 @@ function showMedium(e) { var medium = e.data; - /* work around jQuery bug when trying to remove applet from dom with IE */ + /* Work around jQuery bug when trying to remove applet from DOM with IE. */ var applet = $("#applet")[0]; if (applet) { applet.parentNode.removeChild(applet); @@ -105,28 +105,36 @@ rows.push(DIV(null, tiles)); } - return DIV({ 'class': 'map' }, rows); + return DIV(null, rows); } +function positionMapIcon(img, x, y) { + img.style.left = (x - (Math.floor(x / 90) - 1) * 90) + 'px'; + img.style.top = (y - (Math.floor(y / 90) - 1) * 90) + 'px'; + return img; +} + function loadMainInfo(poi) { - var map = []; - map.push(makeMap(poi.x, poi.y)); - map.push(IMG({ 'class': 'icon', - src: '/images/' + poi.icon + '.gif', - width: 16, height: 16, - style: 'left: ' + (poi.x - ((Math.floor(poi.x / 90) - 1) * 90) - 8) + 'px; ' - + 'top: ' + (poi.y - ((Math.floor(poi.y / 90) - 1) * 90) - 8) + 'px'})); - $('#content').empty().append(H2(null, poi.subtitle), - DIV({ 'class': 'map' }, map), - P(null, poi.description)); + $('#content') + .empty() + .append(H2(null, poi.subtitle), + DIV({ 'class': 'map' }, + makeMap(poi.x, poi.y), + positionMapIcon(IMG({ 'class': 'icon', + src: '/images/' + poi.icon + '.gif', + width: 16, height: 16}), + poi.x - 8, poi.y - 8)), + P(null, poi.description)); } function showPOI(e) { var poi = pois[(e.target && e.target.value) || e.data]; - $('#left-bar').empty().append(UL({ id: 'media-list' })); + $('#left-bar') + .empty() + .append(UL({ id: 'media-list' })); if (!poi) { showOverview(); } else { @@ -152,10 +160,17 @@ function showSponsor(e) { var sponsor = e.data; + var contract = sponsor.contracts[0]; $('#content') .empty() .append(H2(null, sponsor.name), - makeMap(sponsor.contracts[0].left, sponsor.contracts[0].top)); + DIV({ 'class': 'map' }, + makeMap(contract.left, contract.top), + positionMapIcon(IMG({ 'class': 'contract', + src: '/contract-image/' + contract.id, + width: contract.width, height: contract.height}), + contract.left, contract.top)) + ); } function showOverview() { @@ -228,7 +243,7 @@ } $('#poi-selector').bind('change', null, showPOI); - loadJSONDoc('/last-sponsors-json').addCallback(loadSponsors); + loadJSONDoc('/sponsors-json').addCallback(loadSponsors); } catch (e) { alert(e); Modified: trunk/projects/bos/web/packages.lisp =================================================================== --- trunk/projects/bos/web/packages.lisp 2008-11-29 21:55:51 UTC (rev 4101) +++ trunk/projects/bos/web/packages.lisp 2008-11-30 10:29:40 UTC (rev 4102) @@ -7,6 +7,7 @@ :cl-user :cl-interpol :cl-ppcre + :alexandria :xhtml-generator :cxml :puri @@ -22,4 +23,5 @@ :bos.m2 :bos.m2.config) (:shadowing-import-from :cl-interpol #:quote-meta-chars) + (:shadowing-import-from :alexandria #:array-index) (:export)) Modified: trunk/projects/bos/web/sponsor-handlers.lisp =================================================================== --- trunk/projects/bos/web/sponsor-handlers.lisp 2008-11-29 21:55:51 UTC (rev 4101) +++ trunk/projects/bos/web/sponsor-handlers.lisp 2008-11-30 10:29:40 UTC (rev 4102) @@ -348,12 +348,32 @@ (cmslink #?"edit-sponsor/$((store-object-id sponsor))" "return to sponsor"))))) -;;; last-sponsors-json-handler -(defclass last-sponsors-json-handler (page-handler) +;;; sponsors-json-handler +(defclass sponsors-json-handler (page-handler) ()) -(defmethod handle ((handler last-sponsors-json-handler)) +(defun sponsors-matching (query) + (when (< 2 (length query)) + (remove-if-not (curry #'search (string-downcase query)) + (class-instances 'sponsor) + :key (compose #'string-downcase #'user-full-name)))) + +(defun largest-sponsors () + (mapcar #'contract-sponsor + (subseq (sort (copy-list (class-instances 'contract)) + #'> + :key (compose #'length #'contract-m2s)) + 0 20))) + +(defmethod handle ((handler sponsors-json-handler)) (last-contracts-handle-if-modified-since) (with-json-response () (json:with-object-element ("sponsors") - (bos.m2:last-sponsors-as-json)))) \ No newline at end of file + (bos.m2:sponsors-as-json + (cond + ((query-param "q") + (sponsors-matching (query-param "q"))) + ((query-param "largest") + (largest-sponsors)) + (t + (mapcar #'contract-sponsor (last-paid-contracts)))))))) \ No newline at end of file Modified: trunk/projects/bos/web/webserver.lisp =================================================================== --- trunk/projects/bos/web/webserver.lisp 2008-11-29 21:55:51 UTC (rev 4101) +++ trunk/projects/bos/web/webserver.lisp 2008-11-30 10:29:40 UTC (rev 4102) @@ -185,7 +185,7 @@ ("/poi-javascript" poi-javascript-handler) ("/m2-javascript" m2-javascript-handler) ("/poi-json" poi-json-handler) - ("/last-sponsors-json" last-sponsors-json-handler) + ("/sponsors-json" sponsors-json-handler) ("/sponsor-login" sponsor-login-handler) ("/create-allocation-area" create-allocation-area-handler) ("/allocation-area" allocation-area-handler)

1 0

[bknr-cvs] hans changed trunk/projects/bos/
by BKNR Commits 29 Nov '08

29 Nov '08

Revision: 4101 Author: hans URL: http://bknr.net/trac/changeset/4101 Show last sponsors on overview page. U trunk/projects/bos/m2/m2.lisp U trunk/projects/bos/m2/packages.lisp U trunk/projects/bos/payment-website/static/poi-ms.html U trunk/projects/bos/payment-website/static/poi-ms.js U trunk/projects/bos/web/contract-handlers.lisp U trunk/projects/bos/web/poi-handlers.lisp U trunk/projects/bos/web/sponsor-handlers.lisp U trunk/projects/bos/web/webserver.lisp Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-11-29 16:11:08 UTC (rev 4100) +++ trunk/projects/bos/m2/m2.lisp 2008-11-29 21:55:51 UTC (rev 4101) @@ -173,6 +173,9 @@ (or (call-next-method) "en")) +(defun sponsor-paid-contracts (sponsor) + (remove-if-not #'contract-paidp (sponsor-contracts sponsor))) + (defvar *sponsor-counter-lock* (bknr.datastore::mp-make-lock "Sponsor Counter Lock")) (defvar *sponsor-counter* 0) @@ -494,10 +497,6 @@ (with-points (center) (geo-utm:utm-x-y-to-lon-lat (+ +nw-utm-x+ center-x) (- +nw-utm-y+ center-y) +utm-zone+ t)))) -(defun tx-make-contract (sponsor m2-count &key date paidp expires) - (warn "Old tx-make-contract transaction used, contract dates may be wrong") - (tx-do-make-contract sponsor m2-count :date date :paidp paidp :expires expires)) - (define-condition allocation-areas-exhausted (simple-error) ((numsqm :initarg :numsqm :reader numsqm)) (:report (lambda (condition stream) @@ -684,22 +683,53 @@ (defun make-m2-javascript (sponsor) "Erzeugt das Quadratmeter-Javascript für die angegebenen Contracts" (with-output-to-string (*standard-output*) - (let ((paid-contracts (remove nil (sponsor-contracts sponsor) :key #'contract-paidp))) - (format t "profil = {};~%") - (format t "profil.id = ~D;~%" (store-object-id sponsor)) - (format t "profil.name = ~S;~%" (string-safe (or (user-full-name sponsor) "[anonym]"))) - (format t "profil.country = ~S;~%" (or (sponsor-country sponsor) "[unbekannt]")) - (format t "profil.anzahl = ~D;~%" (loop for contract in paid-contracts - sum (length (contract-m2s contract)))) - (format t "profil.nachricht = \"~A\";~%" (string-safe (sponsor-info-text sponsor))) - (format t "profil.contracts = [ ];~%") - (loop for contract in paid-contracts - do (destructuring-bind (left top width height) (contract-bounding-box contract) - (format t "profil.contracts.push({ id: ~A, left: ~A, top: ~A, width: ~A, height: ~A, date: ~S });~%" - (store-object-id contract) - left top width height - (format-date-time (contract-date contract) :show-time nil))))))) + (format t "profil = {};~%") + (format t "profil.id = ~D;~%" (store-object-id sponsor)) + (format t "profil.name = ~S;~%" (string-safe (or (user-full-name sponsor) "[anonym]"))) + (format t "profil.country = ~S;~%" (or (sponsor-country sponsor) "[unbekannt]")) + (format t "profil.anzahl = ~D;~%" (loop for contract in (sponsor-paid-contracts sponsor) + sum (length (contract-m2s contract)))) + (format t "profil.nachricht = \"~A\";~%" (string-safe (sponsor-info-text sponsor))) + (format t "profil.contracts = [ ];~%") + (dolist (contract (sponsor-paid-contracts sponsor)) + (destructuring-bind (left top width height) (contract-bounding-box contract) + (format t "profil.contracts.push({ id: ~A, left: ~A, top: ~A, width: ~A, height: ~A, date: ~S });~%" + (store-object-id contract) + left top width height + (format-date-time (contract-date contract) :show-time nil)))))) +(defmethod json-encode progn ((contract contract)) + (destructuring-bind (left top width height) (contract-bounding-box contract) + (json:encode-object-elements + "timestamp" (format-date-time (contract-date contract) :mail-style t) + "count" (length (contract-m2s contract)) + "top" top + "left" left + "width" width + "height" height))) + +(defmethod json-encode progn ((sponsor sponsor)) + (json:encode-object-elements + "name" (user-full-name sponsor) + "country" (or (sponsor-country sponsor) "sponsor-country-unknown") + "sqmCount" (reduce #'+ (mapcar (alexandria:compose #'length #'contract-m2s) (sponsor-contracts sponsor)) + :initial-value 0) + "infoText" (sponsor-info-text sponsor)) + (unless (user-full-name sponsor) + (json:encode-object-element "anonymous" t)) + (json:with-object-element ("contracts") + (json:with-array () + (dolist (contract (sponsor-paid-contracts sponsor)) + (json:with-object () + (json-encode contract)))))) + +(defun last-sponsors-as-json () + "Render the last sponsors as JSON" + (json:with-array () + (dolist (sponsor (mapcar #'contract-sponsor (last-paid-contracts))) + (json:with-object () + (json-encode sponsor))))) + (defun delete-directory (pathname) (cl-fad:delete-directory-and-files pathname :if-does-not-exist :ignore)) Modified: trunk/projects/bos/m2/packages.lisp =================================================================== --- trunk/projects/bos/m2/packages.lisp 2008-11-29 16:11:08 UTC (rev 4100) +++ trunk/projects/bos/m2/packages.lisp 2008-11-29 21:55:51 UTC (rev 4101) @@ -171,6 +171,7 @@ #:contract-stats-for-country #:last-paid-contracts #:do-sponsor-countries + #:last-sponsors-as-json #:make-m2-javascript #:recolorize-contracts Modified: trunk/projects/bos/payment-website/static/poi-ms.html =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.html 2008-11-29 16:11:08 UTC (rev 4100) +++ trunk/projects/bos/payment-website/static/poi-ms.html 2008-11-29 21:55:51 UTC (rev 4101) @@ -21,13 +21,15 @@ </div> <div class="yui-b"> <div id="small-map" class="map"> - <img src="/infosystem/bilder/uebersichtskarte_klein.gif" width="118" height="62"/> + <a href="#"> + <img src="/infosystem/bilder/uebersichtskarte_klein.gif" width="118" height="62"/> + </a> </div> <select id="poi-selector" size="1"> - <option>Überblick</option> + <option value="overview">Überblick</option> </select> - <ul id="media-list"> - </ul> + <div id="left-bar"> + </div> </div> </div> <div id="ft"> Modified: trunk/projects/bos/payment-website/static/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.js 2008-11-29 16:11:08 UTC (rev 4100) +++ trunk/projects/bos/payment-website/static/poi-ms.js 2008-11-29 21:55:51 UTC (rev 4101) @@ -3,11 +3,16 @@ $(document).ready(init); var pois = {}; +var sponsors = []; Date.prototype.renderDate = function() { return this.getDate() + '.' + this.getMonth() + '.' + (this.getYear() > 2000 ? this.getYear() : (1900 + this.getYear())); } +function NLS(key) { + return key; // for now +} + var B = createDOMFunc('b', null); var OBJECT = createDOMFunc('object'); var PARAM = createDOMFunc('param'); @@ -84,20 +89,28 @@ P(null, medium.description)); } -function loadMainInfo(poi) { - var map = []; +function makeMap(centerX, centerY) { + var rows = []; + for (var y = -1; y < 3; y++) { var tiles = []; for (var x = -1; x < 3; x++) { tiles.push(IMG({ 'class': 'map-tile', src: '/overview/' - + (Math.floor(poi.x / 90) + x) * 90 + + (Math.floor(centerX / 90) + x) * 90 + '/' - + (Math.floor(poi.y / 90) + y) * 90, + + (Math.floor(centerY / 90) + y) * 90, width: 90, height: 90 })); } - map.push(DIV(null, tiles)); + rows.push(DIV(null, tiles)); } + + return DIV({ 'class': 'map' }, rows); +} + +function loadMainInfo(poi) { + var map = []; + map.push(makeMap(poi.x, poi.y)); map.push(IMG({ 'class': 'icon', src: '/images/' + poi.icon + '.gif', width: 16, height: 16, @@ -112,10 +125,13 @@ function showPOI(e) { var poi = pois[(e.target && e.target.value) || e.data]; - $('#media-list').empty(); + + $('#left-bar').empty().append(UL({ id: 'media-list' })); if (!poi) { showOverview(); } else { + $('#poi-selector').val(poi.id); + document.title = poi.title; $('.yui-b h1').html(poi.title); loadMainInfo(poi); @@ -134,8 +150,18 @@ } } +function showSponsor(e) { + var sponsor = e.data; + $('#content') + .empty() + .append(H2(null, sponsor.name), + makeMap(sponsor.contracts[0].left, sponsor.contracts[0].top)); +} + function showOverview() { + $('#poi-selector').val('overview'); + var elements = []; elements.push(IMG({ src: '/infosystem/bilder/karte_uebersicht.jpg', width: 360, height: 360 })); for (var i in pois) { @@ -153,18 +179,33 @@ $('#content') .empty() - .append(H2(null, 'XXuebersichtXX'), + .append(H2(null, NLS('Übersicht')), DIV({ 'class': 'map' }, elements)); + + $('#left-bar') + .empty() + .append(H3(NLS("Letzte Sponsoren")), + UL({ id: 'sponsor-list' })); + + map(function (sponsor) { + $('#sponsor-list') + .append($(A({ href: '#' }, + LI(null, + IMG({ src: '/images/flags/' + sponsor.country.toLowerCase() + '.gif'}), + (new Date(sponsor.contracts[0].timestamp)).renderDate(), + BR(), + B(null, sponsor.anonymous ? NLS('anonym') : sponsor.name), + " ", sponsor.contracts[0].count, " m²"))) + .bind('click', sponsor, showSponsor)); + }, sponsors.slice(0, 10)); } -function loadData(data) { +function loadSponsors(data) { try { - for (var i in data.pois) { - var poi = data.pois[i]; - pois[poi.id] = poi; - $('#poi-selector').append(OPTION({ value: poi.id }, poi.title)); + for (var i in data.sponsors) { + var sponsor = data.sponsors[i]; + sponsors.push(sponsor); } - $('#poi-selector').bind('change', null, showPOI); var poi_id = document.location.hash.replace(/#/, ""); if (poi_id) { @@ -178,6 +219,24 @@ } } +function loadPOIs(data) { + try { + for (var i in data.pois) { + var poi = data.pois[i]; + pois[poi.id] = poi; + $('#poi-selector').append(OPTION({ value: poi.id }, poi.title)); + } + $('#poi-selector').bind('change', null, showPOI); + + loadJSONDoc('/last-sponsors-json').addCallback(loadSponsors); + } + catch (e) { + alert(e); + } +} + function init() { - loadJSONDoc('/poi-json').addCallback(loadData); + $('#small-map a').bind('click', showPOI); + + loadJSONDoc('/poi-json').addCallback(loadPOIs); } \ No newline at end of file Modified: trunk/projects/bos/web/contract-handlers.lisp =================================================================== --- trunk/projects/bos/web/contract-handlers.lisp 2008-11-29 16:11:08 UTC (rev 4100) +++ trunk/projects/bos/web/contract-handlers.lisp 2008-11-29 21:55:51 UTC (rev 4101) @@ -44,3 +44,4 @@ (not (contract-tree-needs-update-p))) "READY" "PROCESSING"))))) + Modified: trunk/projects/bos/web/poi-handlers.lisp =================================================================== --- trunk/projects/bos/web/poi-handlers.lisp 2008-11-29 16:11:08 UTC (rev 4100) +++ trunk/projects/bos/web/poi-handlers.lisp 2008-11-29 21:55:51 UTC (rev 4101) @@ -396,20 +396,22 @@ (setf (hunchentoot:header-out :last-modified) (hunchentoot:rfc-1123-date pois-last-change)))) +(defun last-contracts-handle-if-modified-since () + (hunchentoot:handle-if-modified-since + (reduce #'max (last-paid-contracts) + :key (lambda (contract) (store-object-last-change contract 0))))) + (defmethod handle ((handler poi-javascript-handler)) (poi-handle-if-modified-since) - (let* ((last-paid-contracts (last-paid-contracts)) - (timestamp (reduce #'max last-paid-contracts - :key (lambda (contract) (store-object-last-change contract 0))))) - (hunchentoot:handle-if-modified-since timestamp) - (with-http-response (:content-type "text/html; charset=UTF-8") - (with-http-body () - (html - ((:script :language "JavaScript") - (:princ (make-poi-javascript (request-language))) - (:princ "parent.poi_fertig(pois, anzahlSponsoren, anzahlVerkauft);") - (:princ (format nil "parent.last_sponsors([~{~A~^,~%~}]);" - (mapcar #'contract-js last-paid-contracts))))))))) + (last-contracts-handle-if-modified-since) + (with-http-response (:content-type "text/html; charset=UTF-8") + (with-http-body () + (html + ((:script :language "JavaScript") + (:princ (make-poi-javascript (request-language))) + (:princ "parent.poi_fertig(pois, anzahlSponsoren, anzahlVerkauft);") + (:princ (format nil "parent.last_sponsors([~{~A~^,~%~}]);" + (mapcar #'contract-js (last-paid-contracts))))))))) ;;; poi-xml-handler (defun write-poi-xml (poi language) Modified: trunk/projects/bos/web/sponsor-handlers.lisp =================================================================== --- trunk/projects/bos/web/sponsor-handlers.lisp 2008-11-29 16:11:08 UTC (rev 4100) +++ trunk/projects/bos/web/sponsor-handlers.lisp 2008-11-29 21:55:51 UTC (rev 4101) @@ -345,4 +345,15 @@ (mail-print-pdf contract) (html "The print certificate has been sent to the relevant BOS office address by email." :br)) (let ((sponsor (contract-sponsor contract))) - (cmslink #?"edit-sponsor/$((store-object-id sponsor))" "return to sponsor"))))) \ No newline at end of file + (cmslink #?"edit-sponsor/$((store-object-id sponsor))" "return to sponsor"))))) + + +;;; last-sponsors-json-handler +(defclass last-sponsors-json-handler (page-handler) + ()) + +(defmethod handle ((handler last-sponsors-json-handler)) + (last-contracts-handle-if-modified-since) + (with-json-response () + (json:with-object-element ("sponsors") + (bos.m2:last-sponsors-as-json)))) \ No newline at end of file Modified: trunk/projects/bos/web/webserver.lisp =================================================================== --- trunk/projects/bos/web/webserver.lisp 2008-11-29 16:11:08 UTC (rev 4100) +++ trunk/projects/bos/web/webserver.lisp 2008-11-29 21:55:51 UTC (rev 4101) @@ -185,6 +185,7 @@ ("/poi-javascript" poi-javascript-handler) ("/m2-javascript" m2-javascript-handler) ("/poi-json" poi-json-handler) + ("/last-sponsors-json" last-sponsors-json-handler) ("/sponsor-login" sponsor-login-handler) ("/create-allocation-area" create-allocation-area-handler) ("/allocation-area" allocation-area-handler)

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/poi-ms.js
by BKNR Commits 29 Nov '08

29 Nov '08

Revision: 4100 Author: hans URL: http://bknr.net/trac/changeset/4100 refactor some U trunk/projects/bos/payment-website/static/poi-ms.js Modified: trunk/projects/bos/payment-website/static/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.js 2008-11-29 14:35:52 UTC (rev 4099) +++ trunk/projects/bos/payment-website/static/poi-ms.js 2008-11-29 16:11:08 UTC (rev 4100) @@ -19,33 +19,31 @@ icon: function (medium) { return IMG({ src: '/image/' + medium.id + '/thumbnail,,40,40', width: 40, height: 40 }) }, - makeViewer: function (medium, container) { - replaceChildNodes(container, - IMG({ src: '/image/' + medium.id, - width: medium.width, - height: medium.height })); + makeViewer: function (medium) { + return IMG({ src: '/image/' + medium.id, + width: medium.width, + height: medium.height }); } }, panorama: { icon: function (medium) { return IMG({ src: '/static/panorama-icon.gif', width: 40, height: 40 }) }, - makeViewer: function (medium, container) { - replaceChildNodes(container, - APPLET({ id: 'applet', - archive: '/static/ptviewer.jar', - code: 'ptviewer.class', - width: 400, - height: 300}, - PARAM({ name: 'file', value: '/image/' + medium.id}), - PARAM({ name: 'cursor', value: 'MOVE' }))); + makeViewer: function (medium) { + return APPLET({ id: 'applet', + archive: '/static/ptviewer.jar', + code: 'ptviewer.class', + width: 400, + height: 300}, + PARAM({ name: 'file', value: '/image/' + medium.id}), + PARAM({ name: 'cursor', value: 'MOVE' })); } }, movie: { icon: function (medium) { return IMG({ src: '/static/movie-icon.gif', width: 40, height: 40 }) }, - makeViewer: function (medium, container) { + makeViewer: function (medium) { /* can't use DOM objects like below because IE does not grok it * return OBJECT({ id: 'applet', * width: 360, height: 360, @@ -54,11 +52,13 @@ * PARAM({ name: "movie", * value: "c.swf?path=" + medium.url })); */ - container.innerHTML = + var div = DIV(); + div.innerHTML = "<object id='applet' width='360' height='360' type='application/x-shockwave-flash' " + "data='c.swf?path=" + medium.url + "'>" + "<param name='movie' value='" + medium.url + "'/>" + "</object>"; + return div; } } @@ -76,13 +76,10 @@ $('#media-list *').removeClass('active'); $(e.target).addClass('active'); - var container = DIV(); - mediaHandlers[medium.mediumType].makeViewer(medium, container); - $('#content') .empty() .append(H2(null, medium.title), - container, + mediaHandlers[medium.mediumType].makeViewer(medium), H3(null, medium.subtitle), P(null, medium.description)); }

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/
by BKNR Commits 29 Nov '08

29 Nov '08

Revision: 4099 Author: hans URL: http://bknr.net/trac/changeset/4099 Work around IE problems with flash and applet handling. A trunk/projects/bos/payment-website/static/c.swf A trunk/projects/bos/payment-website/static/jquery-nightly.js U trunk/projects/bos/payment-website/static/poi-ms.css U trunk/projects/bos/payment-website/static/poi-ms.html U trunk/projects/bos/payment-website/static/poi-ms.js Change set too large, please see URL above

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/poi-ms.js
by BKNR Commits 28 Nov '08

28 Nov '08

Revision: 4098 Author: hans URL: http://bknr.net/trac/changeset/4098 Add width/height attributes to images. U trunk/projects/bos/payment-website/static/poi-ms.js Modified: trunk/projects/bos/payment-website/static/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.js 2008-11-28 23:56:21 UTC (rev 4097) +++ trunk/projects/bos/payment-website/static/poi-ms.js 2008-11-29 00:02:12 UTC (rev 4098) @@ -20,7 +20,9 @@ return IMG({ src: '/image/' + medium.id + '/thumbnail,,40,40', width: 40, height: 40 }) }, makeViewer: function (medium) { - return IMG({ src: '/image/' + medium.id }); + return IMG({ src: '/image/' + medium.id, + width: medium.width, + height: medium.height }); } }, panorama: {

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/poi-ms.
by BKNR Commits 28 Nov '08

28 Nov '08

Revision: 4097 Author: hans URL: http://bknr.net/trac/changeset/4097 Refactor a bit. Add overview page. Add POI selector. U trunk/projects/bos/payment-website/static/poi-ms.css U trunk/projects/bos/payment-website/static/poi-ms.html U trunk/projects/bos/payment-website/static/poi-ms.js Modified: trunk/projects/bos/payment-website/static/poi-ms.css =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.css 2008-11-28 19:36:24 UTC (rev 4096) +++ trunk/projects/bos/payment-website/static/poi-ms.css 2008-11-28 23:56:21 UTC (rev 4097) @@ -2,6 +2,10 @@ h2 { font-size: 160% } h3 { font-size: 120% } +ul#media-list { + margin: 2em 0em 2em 0em; +} + ul#media-list li { position: relative; height: 44px; @@ -18,6 +22,11 @@ background-color: #0f0; } +#poi-selector { + width: 300px; + font-size: 180%; +} + .map { position: relative; } Modified: trunk/projects/bos/payment-website/static/poi-ms.html =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.html 2008-11-28 19:36:24 UTC (rev 4096) +++ trunk/projects/bos/payment-website/static/poi-ms.html 2008-11-28 23:56:21 UTC (rev 4097) @@ -17,64 +17,16 @@ <div id="bd"> <div id="yui-main"> <div class="yui-b" id="content"> - <img src="/poi-image/sunbear-sanctuary/1" width="360" - height="360" float="left"/>Am 11.01 wurde in Samboja Lestari ein - kleiner weiblicher Malaienbär (indonesisch: Bruang Madu = - Honigbär) von einem Dorfbewohner abgegeben, die Mutter ist - wahrscheinlich getötet worden. Bei der Ankunft war sie - ungefähr eine Woche alt und wog nur einen Kilo. Seitdem - wird sie von sechs Pflegern abwechselnd rund um die Uhr - gepflegt. Ihr wurde der Name Arkana gegeben, und - inzwischen wiegt sie schon 1,6 Kilo. Ihre neue - "Mutter", also die Hauptbezugsperson ist Slamet - Mulyono. Täglich wird sie für eine Stunde in die Sonne - gebracht, mehrmals täglich wird ihre Temperatur gemessen, - die genau wie bei Menschen auch zwischen 36 und 37 Grad - liegt. Fällt die Temperatur, wird sie mit Eukalypusöl - (indonesisch: Minyak Kayu Putih) eingerieben. Auch nachdem - sie Milch bekommt, wird sie damit eingerieben, um den - Kreislauf anzuregen. Wenn sie älter ist, wird sie Früchte - zu essen bekommen, das Hauptnahrungsmittel der - Malaienbären. Die Früchte, meistens Salak, Mango, Papaya, - Ananas und Zuckerrohr kommen aus dem ökologischen Garten - Samboja Lestaris Mehrmals täglich bekommt sie ein frisches - Nest aus verschieden Blättern, normalerweise frisst die - Mutter die Exkremente, und hält so das Nest sauber. </div> </div> <div class="yui-b"> - <h1>Malaienbärgehege</h1> + <div id="small-map"> + <img src="/infosystem/bilder/uebersichtskarte_klein.gif" width="118" height="62"/> + </div> + <select id="poi-selector" size="1"> + <option>Überblick</option> + </select> <ul id="media-list"> - <li> - <img src="/poi-image/sunbear-sanctuary/1" width="40" height="40"/> - 20.03.2004<br/> - <a href="#">Arkana der kleine Malaienbär</a> - </li> - <li> - <img src="/poi-image/sunbear-sanctuary/2" width="40" height="40" /> - 20.03.2004<br/> - <a href="#">Ursus Malayanus</a> - </li> - <li> - <img src="/poi-image/sunbear-sanctuary/3" width="40" height="40" /> - 20.03.2004<br/> - <a href="#">Das Gehege</a> - </li> - <li> - <img src="/poi-image/sunbear-sanctuary/4" width="40" height="40" /> - 20.03.2004<br/> - <a href="#">Fütterungskäfig</a> - </li> - <li> - <img src="/poi-image/sunbear-sanctuary/5" width="40" height="40" /> - 20.03.2004<br/> - <a href="#">Futterzubereitung</a> - </li> - <li> - <img src="/poi-image/sunbear-sanctuary/6" width="40" height="40" /> - 20.03.2004<br/> - <a href="#">Erfrischung in den Tropen</a> - </li> </ul> </div> </div> Modified: trunk/projects/bos/payment-website/static/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.js 2008-11-28 19:36:24 UTC (rev 4096) +++ trunk/projects/bos/payment-website/static/poi-ms.js 2008-11-28 23:56:21 UTC (rev 4097) @@ -2,8 +2,7 @@ $(document).ready(init); -var poi_id; -var poi; +var pois = {}; Date.prototype.renderDate = function() { return this.getDate() + '.' + this.getMonth() + '.' + (1900 + this.getYear()); @@ -17,55 +16,52 @@ var mediaHandlers = { image: { - icon: function (medium) { return IMG({ src: '/image/' + medium.id, width: 40, height: 40 }) }, - action: function (medium) { - $('#content') - .empty() - .append(H2(null, medium.title), - IMG({ src: '/image/' + medium.id }), BR(), - H3(null, medium.subtitle), - P(null, medium.description)); + icon: function (medium) { + return IMG({ src: '/image/' + medium.id + '/thumbnail,,40,40', width: 40, height: 40 }) + }, + makeViewer: function (medium) { + return IMG({ src: '/image/' + medium.id }); } }, panorama: { - icon: function (medium) { return IMG({ src: '/static/panorama-icon.gif', width: 40, height: 40 }) }, - action: function (medium) { - $('#content') - .empty() - .append(H2(null, medium.title), - APPLET({ archive: '/static/ptviewer.jar', - code: 'ptviewer.class', - width: 400, - height: 300}, - PARAM({ name: 'file', value: '/image/' + medium.id}), - PARAM({ name: 'cursor', value: 'MOVE' })), - H3(null, medium.subtitle), - P(null, medium.description)); + icon: function (medium) { + return IMG({ src: '/static/panorama-icon.gif', width: 40, height: 40 }) + }, + makeViewer: function (medium) { + return APPLET({ archive: '/static/ptviewer.jar', + code: 'ptviewer.class', + width: 400, + height: 300}, + PARAM({ name: 'file', value: '/image/' + medium.id}), + PARAM({ name: 'cursor', value: 'MOVE' })); } }, movie: { - icon: function (medium) { return IMG({ src: '/static/movie-icon.gif', width: 40, height: 40 }) }, - action: function (medium) { - $('#content') - .empty() - .append(H2(null, medium.title), - OBJECT({ width: 360, height: 360 }, - PARAM({ name: "movie", value: medium.url }), - EMBED({ src: medium.url, type: 'application/x-shockwave-flash', - width: 400, height: 300 })), BR(), - H3(null, medium.subtitle), - P(null, medium.description)); + icon: function (medium) { + return IMG({ src: '/static/movie-icon.gif', width: 40, height: 40 }) + }, + makeViewer: function (medium) { + return OBJECT({ width: 360, height: 360 }, + PARAM({ name: "movie", value: medium.url }), + EMBED({ src: medium.url, type: 'application/x-shockwave-flash', + width: 400, height: 300 })); } } }; -function selectMedium(fn, e) { +function showMedium(e) { + var medium = e.data; $('#media-list *').removeClass('active'); $(e.target).addClass('active'); - fn(); + $('#content') + .empty() + .append(H2(null, medium.title), + mediaHandlers[medium.mediumType].makeViewer(medium), + H3(null, medium.subtitle), + P(null, medium.description)); } -function loadMainInfo() { +function loadMainInfo(poi) { var map = []; for (var y = -1; y < 3; y++) { var tiles = []; @@ -81,6 +77,7 @@ } map.push(IMG({ 'class': 'icon', src: '/images/' + poi.icon + '.gif', + width: 16, height: 16, style: 'left: ' + (poi.x - ((Math.floor(poi.x / 90) - 1) * 90) - 8) + 'px; ' + 'top: ' + (poi.y - ((Math.floor(poi.y / 90) - 1) * 90) - 8) + 'px'})); @@ -89,40 +86,69 @@ P(null, poi.description)); } -var B = createDOMFunc('b', null); +function showPOI(e) { + var poi = pois[(e.target && e.target.value) || e.data]; -function loadPoi() { - document.title = poi.title; - $('.yui-b h1').html(poi.title); - loadMainInfo(); $('#media-list').empty(); - map(function (medium) { - if (mediaHandlers[medium.mediumType]) { - $('#media-list') - .append($(A({ href: '#' }, - LI(null, - mediaHandlers[medium.mediumType].icon(medium), - (new Date(medium.timestamp)).renderDate(), - BR(), - B(null, medium.title || medium.name)))) - .bind('click', null, partial(selectMedium, partial(mediaHandlers[medium.mediumType].action, medium)))); - } - }, poi.media); + if (!poi) { + showOverview(); + } else { + document.title = poi.title; + $('.yui-b h1').html(poi.title); + loadMainInfo(poi); + map(function (medium) { + if (mediaHandlers[medium.mediumType]) { + $('#media-list') + .append($(A({ href: '#' }, + LI(null, + mediaHandlers[medium.mediumType].icon(medium), + (new Date(medium.timestamp)).renderDate(), + BR(), + B(null, medium.title || medium.name)))) + .bind('click', medium, showMedium)); + } + }, poi.media); + } } +function showOverview() { + + var elements = []; + elements.push(IMG({ src: '/infosystem/bilder/karte_uebersicht.jpg', width: 360, height: 360 })); + for (var i in pois) { + var poi = pois[i]; + var link = A({ href: '#' }, + IMG({ 'class': 'icon', + src: '/images/' + poi.icon + '.gif', + width: 16, height: 16, + title: poi.title, + style: 'left: ' + (Math.round(poi.x / 30) - 8) + 'px; ' + + 'top: ' + (Math.round(poi.y / 30) - 8) + 'px' })); + $(link).bind('click', poi.id, showPOI); + elements.push(link); + } + + $('#content') + .empty() + .append(H2(null, 'XXuebersichtXX'), + DIV({ 'class': 'map' }, elements)); +} + function loadData(data) { try { - var pois = data.pois; + for (var i in data.pois) { + var poi = data.pois[i]; + pois[poi.id] = poi; + $('#poi-selector').append(OPTION({ value: poi.id }, poi.title)); + } + $('#poi-selector').bind('change', null, showPOI); - for (var i in pois) { - if (pois[i].id == poi_id) { - poi = pois[i]; - loadPoi(); - return; - } + var poi_id = document.location.hash.replace(/#/, ""); + if (poi_id) { + showPOI({ data: poi_id }); + } else { + showOverview(); } - - alert('invalid poi id (not found)'); } catch (e) { alert(e); @@ -130,11 +156,5 @@ } function init() { - poi_id = document.location.hash.replace(/#/, ""); - - if (poi_id.match(/^[0-9]+$/)) { - loadJSONDoc('/poi-json').addCallback(loadData); - } else { - alert('invalid poi id'); - } + loadJSONDoc('/poi-json').addCallback(loadData); } \ No newline at end of file

1 0

[bknr-cvs] hans changed trunk/libraries/yason/yason.asd
by BKNR Commits 28 Nov '08

28 Nov '08

Revision: 4096 Author: hans URL: http://bknr.net/trac/changeset/4096 Add missing dependency on alexandria U trunk/libraries/yason/yason.asd Modified: trunk/libraries/yason/yason.asd =================================================================== --- trunk/libraries/yason/yason.asd 2008-11-28 19:30:00 UTC (rev 4095) +++ trunk/libraries/yason/yason.asd 2008-11-28 19:36:24 UTC (rev 4096) @@ -23,7 +23,7 @@ :description "JSON parser/encoder" :long-description "" - :depends-on () + :depends-on (:alexandria) :components ((:file "package") (:file "encode" :depends-on ("package"))

1 0

[bknr-cvs] hans changed trunk/projects/bos/
by BKNR Commits 28 Nov '08

28 Nov '08

Revision: 4095 Author: hans URL: http://bknr.net/trac/changeset/4095 POI microsite kind of usable. U trunk/projects/bos/m2/poi.lisp U trunk/projects/bos/payment-website/static/poi-ms.css U trunk/projects/bos/payment-website/static/poi-ms.html U trunk/projects/bos/payment-website/static/poi-ms.js Modified: trunk/projects/bos/m2/poi.lisp =================================================================== --- trunk/projects/bos/m2/poi.lisp 2008-11-28 11:07:06 UTC (rev 4094) +++ trunk/projects/bos/m2/poi.lisp 2008-11-28 19:30:00 UTC (rev 4095) @@ -309,6 +309,13 @@ (defmethod json-encode progn ((object store-object)) (json:encode-object-element "id" (store-object-id object))) +(defmethod json-encode progn ((poi poi)) + (json:encode-object-elements + "name" (poi-name poi) + "icon" (poi-icon poi) + "x" (poi-center-x poi) + "y" (poi-center-y poi))) + (defmethod json-encode progn ((blob blob)) (json:encode-object-elements "type" (blob-type blob) Modified: trunk/projects/bos/payment-website/static/poi-ms.css =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.css 2008-11-28 11:07:06 UTC (rev 4094) +++ trunk/projects/bos/payment-website/static/poi-ms.css 2008-11-28 19:30:00 UTC (rev 4095) @@ -12,4 +12,16 @@ position: absolute; left: -42px; top: 2px; -} \ No newline at end of file +} + +ul#media-list .active { + background-color: #0f0; +} + +.map { + position: relative; +} + +.map .icon { + position: absolute; +} Modified: trunk/projects/bos/payment-website/static/poi-ms.html =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.html 2008-11-28 11:07:06 UTC (rev 4094) +++ trunk/projects/bos/payment-website/static/poi-ms.html 2008-11-28 19:30:00 UTC (rev 4095) @@ -13,8 +13,6 @@ <div id="doc" class="yui-t3"> <div id="hd"> <img src="/infosystem/bilder/infosystem_header-de.gif" /> - <h1>Malaienbärgehege</h1> - <h2>Rund 60 Hektar für Renaturierung und Bären</h2> </div> <div id="bd"> <div id="yui-main"> @@ -45,6 +43,7 @@ </div> </div> <div class="yui-b"> + <h1>Malaienbärgehege</h1> <ul id="media-list"> <li> <img src="/poi-image/sunbear-sanctuary/1" width="40" height="40"/> Modified: trunk/projects/bos/payment-website/static/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.js 2008-11-28 11:07:06 UTC (rev 4094) +++ trunk/projects/bos/payment-website/static/poi-ms.js 2008-11-28 19:30:00 UTC (rev 4095) @@ -3,60 +3,130 @@ $(document).ready(init); var poi_id; +var poi; Date.prototype.renderDate = function() { return this.getDate() + '.' + this.getMonth() + '.' + (1900 + this.getYear()); } -var makeMediumMenuEntry = { - image: function (medium) { - return LI(null, - IMG({ src: '/image/' + medium.id, width: 40, height: 40 }), - (new Date(medium.timestamp)).renderDate(), - BR(), - A({ href: '#' }, medium.title || medium.name)); +var B = createDOMFunc('b', null); +var OBJECT = createDOMFunc('object'); +var PARAM = createDOMFunc('param'); +var EMBED = createDOMFunc('embed'); +var APPLET = createDOMFunc('applet'); + +var mediaHandlers = { + image: { + icon: function (medium) { return IMG({ src: '/image/' + medium.id, width: 40, height: 40 }) }, + action: function (medium) { + $('#content') + .empty() + .append(H2(null, medium.title), + IMG({ src: '/image/' + medium.id }), BR(), + H3(null, medium.subtitle), + P(null, medium.description)); + } }, - panorama: function (medium) { - return LI(null, - IMG({ src: '/static/panorama-icon.gif', width: 40, height: 40 }), - (new Date(medium.timestamp)).renderDate(), - BR(), - A({ href: '#' }, medium.title || medium.name)); + panorama: { + icon: function (medium) { return IMG({ src: '/static/panorama-icon.gif', width: 40, height: 40 }) }, + action: function (medium) { + $('#content') + .empty() + .append(H2(null, medium.title), + APPLET({ archive: '/static/ptviewer.jar', + code: 'ptviewer.class', + width: 400, + height: 300}, + PARAM({ name: 'file', value: '/image/' + medium.id}), + PARAM({ name: 'cursor', value: 'MOVE' })), + H3(null, medium.subtitle), + P(null, medium.description)); + } }, - movie: function (medium) { - return LI(null, - IMG({ src: '/static/movie-icon.gif', width: 40, height: 40 }), - (new Date(medium.timestamp)).renderDate(), - BR(), - A({ href: '#' }, medium.title || medium.name)); + movie: { + icon: function (medium) { return IMG({ src: '/static/movie-icon.gif', width: 40, height: 40 }) }, + action: function (medium) { + $('#content') + .empty() + .append(H2(null, medium.title), + OBJECT({ width: 360, height: 360 }, + PARAM({ name: "movie", value: medium.url }), + EMBED({ src: medium.url, type: 'application/x-shockwave-flash', + width: 400, height: 300 })), BR(), + H3(null, medium.subtitle), + P(null, medium.description)); + } } - }; -function loadPoi(poi) { +function selectMedium(fn, e) { + $('#media-list *').removeClass('active'); + $(e.target).addClass('active'); + fn(); +} + +function loadMainInfo() { + var map = []; + for (var y = -1; y < 3; y++) { + var tiles = []; + for (var x = -1; x < 3; x++) { + tiles.push(IMG({ 'class': 'map-tile', + src: '/overview/' + + (Math.floor(poi.x / 90) + x) * 90 + + '/' + + (Math.floor(poi.y / 90) + y) * 90, + width: 90, height: 90 })); + } + map.push(DIV(null, tiles)); + } + map.push(IMG({ 'class': 'icon', + src: '/images/' + poi.icon + '.gif', + style: 'left: ' + (poi.x - ((Math.floor(poi.x / 90) - 1) * 90) - 8) + 'px; ' + + 'top: ' + (poi.y - ((Math.floor(poi.y / 90) - 1) * 90) - 8) + 'px'})); + + $('#content').empty().append(H2(null, poi.subtitle), + DIV({ 'class': 'map' }, map), + P(null, poi.description)); +} + +var B = createDOMFunc('b', null); + +function loadPoi() { document.title = poi.title; - $('#hd h1').html(poi.title); - $('#hd h2').html(poi.subtitle); - $('#content').empty().html(poi.description); + $('.yui-b h1').html(poi.title); + loadMainInfo(); $('#media-list').empty(); map(function (medium) { - if (makeMediumMenuEntry[medium.mediumType]) { - $('#media-list').append(makeMediumMenuEntry[medium.mediumType](medium)); + if (mediaHandlers[medium.mediumType]) { + $('#media-list') + .append($(A({ href: '#' }, + LI(null, + mediaHandlers[medium.mediumType].icon(medium), + (new Date(medium.timestamp)).renderDate(), + BR(), + B(null, medium.title || medium.name)))) + .bind('click', null, partial(selectMedium, partial(mediaHandlers[medium.mediumType].action, medium)))); } }, poi.media); } function loadData(data) { - var pois = data.pois; + try { + var pois = data.pois; - for (var i in pois) { - if (pois[i].id == poi_id) { - loadPoi(pois[i]); - return; + for (var i in pois) { + if (pois[i].id == poi_id) { + poi = pois[i]; + loadPoi(); + return; + } } + + alert('invalid poi id (not found)'); } - - alert('invalid poi id (not found)'); + catch (e) { + alert(e); + } } function init() {

1 0

[bknr-cvs] hans changed trunk/projects/bos/web/sponsor-handlers.lisp
by BKNR Commits 28 Nov '08

28 Nov '08

Revision: 4094 Author: hans URL: http://bknr.net/trac/changeset/4094 merge from bos deployed branch U trunk/projects/bos/web/sponsor-handlers.lisp Modified: trunk/projects/bos/web/sponsor-handlers.lisp =================================================================== --- trunk/projects/bos/web/sponsor-handlers.lisp 2008-11-28 11:02:47 UTC (rev 4093) +++ trunk/projects/bos/web/sponsor-handlers.lisp 2008-11-28 11:07:06 UTC (rev 4094) @@ -101,18 +101,15 @@ (:td (checkbox-field "want-print" "" :checked nil))) (:tr (:td (submit-button "create" "create" :formcheck "javascript:return check_complete_sale()")))))))))) -(defun date-to-universal (date-string) - (apply #'encode-universal-time 0 0 0 (mapcar #'parse-integer (split #?r"\." date-string)))) - (defmethod handle-object-form ((handler edit-sponsor-handler) (action (eql :create)) (sponsor (eql nil))) - (with-query-params (numsqm country email name address date language want-print) + (with-query-params (numsqm country email name address language want-print) (let* ((sponsor (make-sponsor :email email :country country :language language)) (numsqm (parse-integer numsqm)) (contract (make-contract sponsor numsqm :paidp (format nil "~A: manually created by ~A" (format-date-time (get-universal-time)) (user-login (bknr.web:bknr-session-user))) - :date (date-to-universal date) + :date (get-universal-time) :download-only (or (< (* +price-per-m2+ numsqm) *mail-amount*) (not want-print))))) (contract-issue-cert contract name :address address :language language)

1 0

[bknr-cvs] hans changed deployed/bos/projects/bos/web/sponsor-handlers.lisp
by BKNR Commits 28 Nov '08

28 Nov '08

Revision: 4093 Author: hans URL: http://bknr.net/trac/changeset/4093 Fix date non-handling for manually created sponsors. U deployed/bos/projects/bos/web/sponsor-handlers.lisp Modified: deployed/bos/projects/bos/web/sponsor-handlers.lisp =================================================================== --- deployed/bos/projects/bos/web/sponsor-handlers.lisp 2008-11-28 01:07:18 UTC (rev 4092) +++ deployed/bos/projects/bos/web/sponsor-handlers.lisp 2008-11-28 11:02:47 UTC (rev 4093) @@ -101,18 +101,15 @@ (:td (checkbox-field "want-print" "" :checked nil))) (:tr (:td (submit-button "create" "create" :formcheck "javascript:return check_complete_sale()")))))))))) -(defun date-to-universal (date-string) - (apply #'encode-universal-time 0 0 0 (mapcar #'parse-integer (split #?r"\." date-string)))) - (defmethod handle-object-form ((handler edit-sponsor-handler) (action (eql :create)) (sponsor (eql nil))) - (with-query-params (numsqm country email name address date language want-print) + (with-query-params (numsqm country email name address language want-print) (let* ((sponsor (make-sponsor :email email :country country :language language)) (numsqm (parse-integer numsqm)) (contract (make-contract sponsor numsqm :paidp (format nil "~A: manually created by ~A" (format-date-time (get-universal-time)) (user-login (bknr.web:bknr-session-user))) - :date (date-to-universal date) + :date (get-universal-time) :download-only (or (< (* +price-per-m2+ numsqm) *mail-amount*) (not want-print))))) (contract-issue-cert contract name :address address :language language)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

bknr-cvs November 2008