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

[nobody at svn.erp5.org]

Author: gabriel
Date: Sat Jan 29 23:22:38 2011
New Revision: 42768

URL: http://svn.erp5.org?rev=42768&view=rev
Log:
refactor code to allow update the dates and title of event

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_calendar.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=42768&r1=42767&r2=42768&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 23:22:38 2011
@@ -97,7 +97,7 @@ if request_type == "list":\n
                                  start,\n
                                  end,\n
                                  0, display_minimized, 0,\n
-                                 random.randrange(-1,13), 1, \'\', event.getPortalType()])\n
+                                 random.randrange(-1,13), 1, event.getId(), event.getPortalType()])\n
   return dumps(event_dict)\n
 \n
 elif request_type == "remove":\n
@@ -108,13 +108,16 @@ elif request_type == "remove":\n
   return dumps({"IsSuccess": True})\n
 \n
 elif request_type == "update":\n
+  event_id = form.get("event_id")\n
+  if not event_id:\n
+    return dumps({"IsSuccess": False})\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
+  catalog_object = portal.portal_catalog.getResultValue(portal_type=portal_type_list, id=event_id)\n
   event = context.restrictedTraverse(catalog_object.getPath())\n
+  if title and event.getTitle() != title:\n
+    event.setTitle(title)\n
   event.setStartDate(start_date)\n
   event.setStopDate(end_date)\n
   return dumps({"IsSuccess": True})\n

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=42768&r1=42767&r2=42768&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] Sat Jan 29 23:22:38 2011
@@ -65,9 +65,37 @@ function Edit(data){\n
   var url ="WebSection_newEvent";\n
   $("div#new_event_dialog").dialog({\n
     title: "Update Event",\n
-    buttons: {},\n
+    buttons: {\n
+      "Save": function(){\n
+         data = $("form#create_new_event").serializeArray();\n
+         var dataHash = {};\n
+         for (var i=0; i<data.length; i++)\n
+           dataHash[data[i].name] = data[i].value;\n
+         start_date = dataHash.start_date_day + "/" + \n
+                      dataHash.start_date_month + "/" + \n
+                      dataHash.start_date_year + " " + \n
+                      dataHash.start_date_hour + ":" + \n
+                      dataHash.start_date_minute;\n
+\n
+         stop_date = dataHash.stop_date_day + "/" + \n
+                     dataHash.stop_date_month + "/" + \n
+                     dataHash.stop_date_year + " " + \n
+                     dataHash.stop_date_hour + ":" + \n
+                     dataHash.stop_date_minute;\n
+\n
+         var paramList = [{name : \'CalendarEndTime\', \'value\': stop_date},\n
+                      {name : \'CalendarStartTime\', \'value\': start_date},\n
+                      {name : \'title\', \'value\': dataHash.title},\n
+                      {name : \'request_type\', \'value\': \'update\'},\n
+                      {name : \'event_id\', \'value\': $("input#event_id").attr("value")}]\n
+\n
+         $.post("Base_updateCalendarEventList", paramList);\n
+      },\n
+    },\n
   });\n
   $("div#new_event_dialog").load(url, {}, function(){\n
+    $("form#create_new_event").append("<input type=\'hidden\' id=\'event_id\'/>");\n
+    $("input#event_id").attr("value", data[9]);\n
     $("form#create_new_event select").val(data[10]);\n
     $("input[name=\'title\']").attr("value", data[1]);\n
     $("input.start_date_field[name=\'start_date_year\']").attr("value", data[2].getFullYear());\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=42768&r1=42767&r2=42768&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 23:22:38 2011
@@ -1 +1 @@
-200
\ No newline at end of file
+201
\ No newline at end of file