[Erp5-report] r42700 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jan 27 11:47:06 CET 2011
Author: gabriel
Date: Thu Jan 27 11:47:06 2011
New Revision: 42700
URL: http://svn.erp5.org?rev=42700&view=rev
Log:
- rename script
- Add functionality to remove event and add a new event by selecting a date on the calendar
Added:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml
Removed:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_getEventListSerialized.xml
Modified:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml
erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
Removed: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_getEventListSerialized.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_getEventListSerialized.xml?rev=42699&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_getEventListSerialized.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_getEventListSerialized.xml (removed)
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_body</string> </key>
- <value> <string>"""\n
- Script to load all events and organize all data to be loaded on calendar.\n
- XXX - Initial Script to serialize all events\n
-"""\n
-from Products.ERP5Type.JSONEncoder import encodeInJson as dumps\n
-import random\n
-\n
-if request_type == "list":\n
- event_list = context.getPortalObject().event_module.searchFolder()\n
- now = DateTime()\n
- event_dict = {}\n
- event_dict["events"] = []\n
- event_dict["issort"] = True\n
- event_dict["start"] = (now-30).strftime("%m/%d/%Y %H:%M")\n
- event_dict["end"] = (now+30).strftime("%m/%d/%Y %H:%M")\n
- event_dict["error"] = None\n
- for event in event_list:\n
- start = event.getStartDate().strftime("%m/%d/%Y %H:%M")\n
- end = event.getStartDate().strftime("%m/%d/%Y %H:%M")\n
- event_dict["events"].append([random.randrange(10000, 99999),\n
- event.getTitle(),\n
- start,\n
- end,\n
- random.randrange(0,1),1,0,\n
- random.randrange(-1,13),1,\'\',\'\',])\n
- return dumps(event_dict)\n
-</string> </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string>request_type</string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>Base_getEventListSerialized</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Added: 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=42700&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml (added)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml [utf8] Thu Jan 27 11:47:06 2011
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>"""\n
+ Script to load all events and organize all data to be loaded on calendar.\n
+ XXX - Initial Script to serialize all events\n
+"""\n
+from Products.ERP5Type.JSONEncoder import encodeInJson as dumps\n
+from DateTime import DateTime\n
+import random\n
+\n
+def convertToERP5DateTime(date):\n
+ date, hour = date.split()\n
+ day, month, year = date.split("/")\n
+ return DateTime("%s/%s/%s %s" % (year, month, day, hour))\n
+\n
+portal = context.getPortalObject()\n
+form = context.REQUEST.form\n
+portal_type_list = ["Acknowledgement",\n
+ "Fax Message",\n
+ "Letter",\n
+ "Mail Message",\n
+ "Note",\n
+ "Phone Call",\n
+ "Short Message",\n
+ "Site Message",\n
+ "Visit",\n
+ "Web Message"]\n
+\n
+if request_type == "list":\n
+ event_list = portal.event_module.searchFolder()\n
+ now = DateTime()\n
+ event_dict = {}\n
+ event_dict["events"] = []\n
+ event_dict["issort"] = True\n
+ event_dict["start"] = (now-30).strftime("%m/%d/%Y %H:%M")\n
+ event_dict["end"] = (now+30).strftime("%m/%d/%Y %H:%M")\n
+ event_dict["error"] = None\n
+ for event in event_list:\n
+ start = event.getStartDate().strftime("%m/%d/%Y %H:%M")\n
+ end = event.getStartDate().strftime("%m/%d/%Y %H:%M")\n
+ event_dict["events"].append([random.randrange(10000, 99999),\n
+ event.getTitle(),\n
+ start,\n
+ end,\n
+ random.randrange(0,1),1,0,\n
+ random.randrange(-1,13),1,\'\',\'\',])\n
+ return dumps(event_dict)\n
+elif request_type == "remove":\n
+ title = form.get("title")\n
+ catalog_object = portal.portal_catalog.getResultValue(portal_type=portal_type_list, title=title)\n
+ event = context.restrictedTraverse(catalog_object.getPath())\n
+ portal.event_module.deleteContent(event.getId())\n
+elif request_type == "update":\n
+ context.log(form)\n
+ title = form.get("title")\n
+ if not title:\n
+ return None\n
+ end_date = convertToERP5DateTime(form.get("CalendarEndTime"))\n
+ start_date = convertToERP5DateTime(form.get("CalendarStartTime"))\n
+ catalog_object = portal.portal_catalog.getResultValue(portal_type=portal_type_list, title=title)\n
+ event = context.restrictedTraverse(catalog_object.getPath())\n
+ event.setStartDate(start_date)\n
+ event.setStopDate(end_date)\n
+elif request_type == "add":\n
+ end_date = convertToERP5DateTime(form.get("CalendarEndTime"))\n
+ start_date = convertToERP5DateTime(form.get("CalendarStartTime"))\n
+ event_title = form.get("CalendarTitle")\n
+ event = portal.event_module.newContent(portal_type="Web Message", title=event_title)\n
+ event.setStartDate(start_date)\n
+ event.setStopDate(end_date)\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>request_type</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Base_updateCalendarEventList</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml?rev=42700&r1=42699&r2=42700&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml [utf8] Thu Jan 27 11:47:06 2011
@@ -94,7 +94,7 @@ function wtd(p){\n
}\n
\n
$(document).ready(function() { \n
- var DATA_FEED_URL = "Base_getEventListSerialized";\n
+ var DATA_FEED_URL = "Base_updateCalendarEventList";\n
var op = {\n
view: "day",\n
showday: new Date(),\n
@@ -213,9 +213,6 @@ $(document).ready(function() { \n
}\n
},\n
});\n
- $("span#bbit-cs-delete.lk").click(function(event){\n
- event.preventDefault();\n
- });\n
});
]]></string> </value>
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=42700&r1=42699&r2=42700&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Thu Jan 27 11:47:06 2011
@@ -1 +1 @@
-188
\ No newline at end of file
+190
\ No newline at end of file
More information about the Erp5-report
mailing list