Changeset 2508

Timestamp:

07/22/07 13:14:04 (1 year ago)

Author:

ant_39

Message:

CalendarPlugin:

• Events without title now displayed correctly.
  
• Time is now an optional component of begin/end fields.
  
• Resolves: #1734
  

Files:

• calendarplugin/0.10/azcalendar/azcalendar.py (modified) (6 diffs)
• calendarplugin/0.10/azcalendar/caltools.py (added)
• calendarplugin/0.10/azcalendar/templates/azweekcal.cs (modified) (1 diff)

calendarplugin/0.10/azcalendar/azcalendar.py

@@ -12 +12 @@
-import time
-import calendar
+import caltools
-import cal_layout
-
@@ -39 +40 @@
-    def process_add(self, req):
-        add_stylesheet (req, 'hw/css/azcalendar.css')
+
-        if req.method == 'GET' and req.args.has_key('date'):
-            req.hdf['azcalendar.time_begin'] = time.strftime("%Y/%m/%d",(time.strptime(req.args['date'],"%Y%m%d")))
-            req.hdf['azcalendar.time_end'] = time.strftime("%Y/%m/%d",(time.strptime(req.args['date'],"%Y%m%d")))
-            return 'add_event.cs', None
+
-        elif req.method == 'GET' and req.args.has_key('new_event'):
-
-
-
+
+
+
+
-            req.hdf['redir_url'] = str(self.env.href.azcalendar()) + "?date=%s" % date
-
-
+
+
+
+
-            author = req.authname
-
-
-
+
+
+
+
-
-    def process_show(self, req):
@@ -250 +257 @@
-        if req.args.has_key('id'):
-            import re
-;
+
-            if not re.match (r"[0-9]+", xid):
-                return self.process_invalid(req)
@@ -271 +278 @@
-            req.hdf['azcalendar.last_update'] = time.strftime("%Y/%m/%d %H:%M:%S",time.localtime(evt.get_time_update()))
-            return 'azevent.cs', None
+
-        elif req.method == 'GET' and req.args.has_key('update_event'):
+            begin_time, end_time, begin_stamp, end_stamp \
+              = caltools.parse_time_begin_end(req.args['time_begin'], req.args['time_end'])
+
-            evt = Event.get_event(self.env,req.args['evid'])
-            #evt.set_author(req.authname)
@@ -277 +288 @@
-            evt.set_priority(req.args['priority'])
-            evt.set_time_update(int(time.time()))
-int(time.mktime(time.strptime(req.args['time_begin'],"%Y/%m/%d %H:%M")))
-int(time.mktime(time.strptime(req.args['time_end'],"%Y/%m/%d %H:%M")))
+begin_stamp
+end_stamp
-            evt.set_title(req.args['title'])
-(time.strptime(req.args['time_begin'],"%Y/%m/%d %H:%M"))
+ begin_time
-            req.hdf['redir_url'] = str(self.env.href.azcalendar()) + "?date=%s" % date
-            return evt.update(self.env, req)
+
-        elif req.method == 'GET' and req.args.has_key('delete_event'):
+            begin_time, end_time, begin_stamp, end_stamp \
+              = caltools.parse_time_begin_end(req.args['time_begin'], req.args['time_end'])
+
-            evt = Event.get_event(self.env,req.args['evid'])
-(time.strptime(req.args['time_begin'],"%Y/%m/%d %H:%M"))
+ time_begin
-            req.hdf['redir_url'] = str(self.env.href.azcalendar()) + "?date=%s" % date
-            return evt.delete(self.env)
@@ -298 +313 @@
-        KEY = "/azcalendar"
-        query = req.path_info[req.path_info.index (KEY):]
-
+
-        import re
-        if not re.match ("%s(/add|/delete|/event)?($|\?.*)" % KEY, query):

calendarplugin/0.10/azcalendar/templates/azweekcal.cs

@@ -20 +20 @@
-    set:tmp.urlbase = urlbase + '/event?id=' + event.id ?><?cs
-    set:tmp.span = event.brd_end - event.brd_begin ?><?cs
+
+    if:event.title == '' ?><?cs
+        set:event.title = '(no title)' ?><?cs
+    /if ?><?cs
+
-    if:tmp.span >= 4 ?><?cs
-        set:tmp.show = event.title ?><?cs