Merge pull request #1087 from DerPate/master

Agenda Item Time input fixes #1085

openslides/agenda/forms.py

@@ -23,7 +23,7 @@ class ItemForm(CleanHtmlFormMixin, CssClassMixin, forms.ModelForm):
         queryset=Item.objects.all(), label=ugettext_lazy("Parent item"), required=False)
 
     duration = forms.RegexField(
-        regex=re.compile('[0-99]:[0-5][0-9]'),
+        regex=re.compile('^(?:[0-9]{1,2}:[0-5][0-9]|[0-9]+)$'),
         error_message=ugettext_lazy("Invalid format. Hours from 0 to 99 and minutes from 00 to 59"),
         max_length=5,
         required=False,

openslides/agenda/views.py

@@ -57,11 +57,19 @@ class Overview(TemplateView):
         duration = timedelta()
 
         for item in items:
-            if (item.duration is not None and
-                    len(item.duration) > 0):
+            if item.duration is not None and len(item.duration) > 0:
+                if ':' in item.duration:
                     duration_list = item.duration.split(':')
                     duration += timedelta(hours=int(duration_list[0]),
                                           minutes=int(duration_list[1]))
+                else:
+                    hours = int(item.duration) / 60
+                    minutes = int(item.duration) - (60 * hours)
+                    duration += timedelta(hours=hours,
+                                          minutes=minutes)
+                    if minutes < 10:
+                        minutes = "%s%s" % (0, minutes)
+                    item.duration = "%s:%s" % (hours, minutes)
                 if not start is None:
                     item.tooltip = start + duration