20160629-contenttoggler
Summary
- Fix contenttoggler for virbac.bbmb.ngiger.ch
- refdata must download pharmacode for Pharma-Items, too
- evidentia: Fix order of icons, use separate icon for text-changes
- Keep in Mind
Commits
- https://github.com/ngiger/oddb.org/commit/4d5f3639f87aa87bf2a9034fc51f1aa94f586c59 Merge branch 'master' of github.com:zdavatz/oddb.org
- https://github.com/ngiger/oddb.org/commit/5136f1bf151bfcfc8ab9f9aa53bf4d97b4310f99 Fix evidentia icons
- https://github.com/ngiger/oddb.org/commit/0bc03ffc8ee075a7a92bae6d79abcb7c83230e23 Fix evidentia text
Index
- Fix contenttoggler for virbac.bbmb.ngiger.ch
- refdata must download pharmacode for Pharma-Items, too
- evidentia: Fix order of icons, use separate icon for text-changes
- Pending problems
Fix contenttoggler for virbac.bbmb.ngiger.ch
Must find a way to reference the content text to be shown or hidden. This works now, as long as I place the Lieferbedingung outside the form (in the div head).
When I place it inside the form login the login action is executed as well. Why?
My current status is:
Creating local commits to update to dojo 1.11.2. Fixing an error doc/resources/errors/appdown.html.
Must change lib/bbmb/virbac/html/view/login.rb to make the errors disappear, when loading. Why is <link rel="stylesheet" type="text/css"> emitted twice?
Now the login screen displays but shows the details of the lieferbedingung, but I still the the following error in chromium console dojo/parser::parse() error Error: Unable to resolve constructor for: 'contenttoggler'(…). Also Clicking on the "Lieferbdingungen", shows the log entry in the console.
I the HTML source I find the lines
<link rel="stylesheet" type="text/css"> <link rel="stylesheet" type="text/css" href="http://virbac.bbmb.ngiger.ch/resources/bbmb/bbmb.css">
I have no idea, why htmlgrid suddenly emits twice this link. But it does not emit more warnings or error, whether it is present or not. The error about the contenttoggler comes from the new_costumer. Adapting it to the new ContentToggler.
Looks like we must migrate htmlgrid and bbmb to use a current dojo version. There are ywesee.widget defined in the following places
- bbmb/lib/bbmb/html/view/current_order.rb
- DOJO_REQUIRE = [ 'dojo.widget.*', 'ywesee.widget.*',
- bbmb/lib/bbmb/html/view/current_order.rb
- 'ywesee.widget.ContentToggler' ] #, 'dojo.widget.Tooltip' ]
- htmlgrid/lib/htmlgrid/dojotoolkit.rb
- 'data-dojo-type' => 'ywesee.widget.Tooltip',
And is it a good idea to define a ywesee package for dojo? If yes, we must migrate the old style __package__.js to the new package.json. __package__.js are only found under /var/www/sandoz.bbmb.ch, /var/www/virbac.bbmb.ch and /var/www/vetoquinol.bbmb.ch.
refdata must download pharmacode for Pharma-Items, too
When looking at /service/ch.oddb-refdata/log/main/current I find only the following lines
@400000005759860512a811d4 Archiver /var/www/oddb.org/data/xml/XMLRefdataNonPharma-latest.xml 9155590 bytes. archive /var/www/oddb.org/data/xml/XMLRefdataNonPharma-2016.06.09.xml @400000005759862538b5c8bc RefdataArticle.download_all done NonPharma time 2016-06-09 17:07:07 +0200 @400000005759a60c1a2a249c RefdataArticle.download_all starting NonPharma @@items 2 @400000005759a60c1a2a2c6c Skipping downloading NonPharma 8166.487530085 = 2016-06-09 19:23:14 +0200 - 2016-06-09 17:07:07 +0200 @400000005759c58307ca0e84 RefdataArticle.download_all starting NonPharma @@items 2 @400000005759c58307ca1a3c Skipping downloading NonPharma 16221.179231452 = 2016-06-09 21:37:29 +0200 - 2016-06-09 17:07:07 +0200
Why does it not download the pharmacode?
After running jobs/update_refdata on oddb-ci2 I found the following lines in /service/ch.oddb-refdata/log/main/current
@400000005773a0dd15a97e7c RefdataArticle.download_all starting Pharma @@items 0 @400000005773a0e0116e1304 Archiver /var/www/oddb.org/data/xml/XMLRefdataPharma-latest.xml 5401534 bytes. archive /var/www/oddb.org/data/xml/XMLRefdataPharma-2016.06.29.xml @400000005773a0e522e3f02c RefdataArticle.download_all done Pharma time 2016-06-29 12:20:11 +0200
And the pharmacode was imported.
I suspect that the refdata service was not restarted (dates from April).
evidentia: Fix order of icons, use separate icon for text-changes
Sorting did not work correctly as I must change the order of the '&' of the arrays used. Now it looks okay. Removed all spaces from the icon names. Corrected name for the change_log item.
Must also change "Anderungen anzeigen" => "Textänderungen" for Evidentia.
Pushed commits
- Remove old __package__.js (from htmlgrid?, virbac?)
- Remove dojo.ywesee.widget totally
- Better understand on howto override the extension points like on click. See https://dojotoolkit.org/reference-guide/1.10/quickstart/writingWidgets.html#creating-extension-points