[Erp5-report] r42762 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...

[nobody at svn.erp5.org]

Author: gabriel
Date: Sat Jan 29 17:01:18 2011
New Revision: 42762

URL: http://svn.erp5.org?rev=42762&view=rev
Log:
refactor code to display the event on board when the start and the end date is the same

Modified:
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
    erp5/trunk/bt5/erp5_web_ung_theme/bt/revision

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml?rev=42762&r1=42761&r2=42762&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml [utf8] Sat Jan 29 17:01:18 2011
@@ -88,11 +88,15 @@ if request_type == "list":\n
   for event in event_list:\n
     start = event.getStartDate().strftime("%m/%d/%Y %H:%M")\n
     end = event.getStopDate().strftime("%m/%d/%Y %H:%M")\n
+    if event.getStartDate().Date() == event.getStopDate().Date():\n
+      display_minimized = 0\n
+    else:\n
+      display_minimized = 1\n
     event_dict["events"].append([random.randrange(10000, 99999),\n
                                  event.getTitle(),\n
                                  start,\n
                                  end,\n
-                                 random.randrange(0,1),1,0,\n
+                                 0, display_minimized, 0,\n
                                  random.randrange(-1,13), 1, \'\', event.getPortalType()])\n
   return dumps(event_dict)\n
 \n

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml?rev=42762&r1=42761&r2=42762&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] Sat Jan 29 17:01:18 2011
@@ -305,7 +305,7 @@ $().ready(function(){\n
   });\n
   $("div#preference_dialog").dialog({\n
     autoOpen: false,\n
-    height: 460,\n
+    height: 480,\n
     width: 330,\n
     modal:true,\n
     buttons: {\n

Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=42762&r1=42761&r2=42762&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Sat Jan 29 17:01:18 2011
@@ -1 +1 @@
-199
\ No newline at end of file
+200
\ No newline at end of file