Reskreen/settings.py

@@ -47,6 +47,7 @@ INSTALLED_APPS = [
     'collabs.apps.CollabsConfig',
     'mycaldav.apps.CaldavConfig',
     'studenteval.apps.StudentevalConfig',
+    'comm_op.apps.CommOpConfig',
     'custom_admin.apps.CustomAdminConfig',
     'rangefilter',
     'django.contrib.admin',

comm_op/admin.py

@@ -0,0 +1,42 @@
+from django.contrib import admin
+from comm_op.models import comm_opMessage
+from django.contrib.auth.models import User
+
+# Register your models here.
+
+@admin.register(comm_opMessage)
+class MessageAdmin(admin.ModelAdmin):
+    always_show_username = True
+    fieldsets = [
+        (None, {'fields': ['sKey','sTitle','sDesc', 'bDone']}),
+        ('Date information', {'fields': ['dtStart','dtEnd']}),
+        ('Auteur', {'fields': ['Author']}),
+    ]
+
+    list_display = ('sKey', 'sTitle', 'dtStart', 'dtEnd', 'sAuthor', 'bDone')
+    #list_filter = ['pub_date']
+    #search_fields = ['question_txt']
+
+    def save_model(self, request, obj, form, change):
+        obj.sAuthor = obj.Author.first_name + " " + obj.Author.last_name
+        obj.sAuthor = obj.Author.first_name + " " + obj.Author.last_name
+        obj.save()
+
+    def formfield_for_foreignkey(self, db_field, request=None, **kwargs):
+        field = super(MessageAdmin, self).formfield_for_foreignkey(                                                db_field, request, **kwargs)
+        if db_field.remote_field.model == User:
+            field.label_from_instance = self.get_user_label
+        return field
+
+    def formfield_for_manytomany(self, db_field, request=None, **kwargs):
+        field = super(MessageAdmin, self).formfield_for_manytomany(                                                db_field, request, **kwargs)
+        if db_field.remote_field.model == User:
+            field.label_from_instance = self.get_user_label
+        return field
+
+    def get_user_label(self, user):
+        name = user.get_full_name()
+        username = user.username
+        if not self.always_show_username:
+            return name or username
+        return (name and name != username and '%s (%s)' % (name, username)                or username)

comm_op/apps.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class CommOpConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'comm_op'
+    verbose_name = "Référent journalier"

comm_op/models.py

@@ -0,0 +1,27 @@
+from django.db import models
+from django.conf import settings
+from django.utils import timezone
+import uuid
+
+# Create your models here.
+class comm_opMessage(models.Model):
+    uuid = models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True)
+    sKey = models.CharField("Clé d'identification", max_length=100)
+    sTitle = models.CharField('Titre', max_length=250)
+    sDesc = models.TextField('Description')
+    dtStart = models.DateField("Date de début", default=timezone.now)
+    dtEnd = models.DateField("Date de fin", blank=True, null=True)
+    bDone = models.BooleanField("Effectuée", default=False)
+    sAuthor = models.CharField("Auteur", max_length=120)
+    Author = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name="Auteur", on_delete=models.DO_NOTHING)
+    dtUpdated = models.DateTimeField('date updated', auto_now=True)
+    dtCreated = models.DateTimeField('date published', auto_now_add=True)
+
+
+
+    def __str__(self):
+        return self.sKey + " -- " + self.sTitle
+
+    class Meta:
+        verbose_name = "Communication importante"
+        verbose_name_plural = "Communications importantes"

comm_op/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

comm_op/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

mycaldav/templates/op/op_view.html

@@ -12,11 +12,10 @@
                     {% if task.done %}
                         {{task.key}}
                     {% else %}
-                         <a href="op/edit/{{task.uiid}}">{{task.key}}</a>
+                         <a href="op/edit/{{task.uuid}}">{{task.key}}</a>
                     {% endif %}
                    </span><br>
-                    {{task.str_start_date}} - {{task.str_end_date}}<br>
-                    {{task.str_start_time}} - {{task.str_end_time}}
+                    {{task.str_start_date}} {% if task.str_end_date != None %}- {{task.str_end_date}} {% endif %}
                 </td>&nbsp;&nbsp;&nbsp;&nbsp;
                 <td style="{% if task.done %}text-decoration:line-through{% endif %}">
                     {% if task.href != "" %}

mycaldav/views.py

@@ -6,6 +6,7 @@ from django.template import loader
 from django.views.decorators.clickjacking import xframe_options_exempt
 from django.contrib.auth.decorators import login_required
 
+
 import caldav as cal
 
 from datetime import datetime, timedelta, time
@@ -15,6 +16,20 @@ from datetime import datetime, timedelta, time
 from mycaldav.models import *
 from mycaldav.settings import *
 from mycaldav.export_team_pdf import *
+from comm_op.models import comm_opMessage
+
+class caldav_item:
+    def __init__(self):
+        self.uuid = ""
+        self.name = ""
+        self.desc = ""
+        self.key = ""
+        self.done = False
+        self.href = "#"
+        self.str_start_date = ""
+        self.str_end_date = ""
+
+
 
 
 @xframe_options_exempt
@@ -37,8 +52,10 @@ def view_task_edit_caldav(request, uuid):
 
 def view_op_edit_caldav(request, uuid):
     print(uuid)
-    myClient = cls_caldav_client()
-    myClient.mark_as_done_task(calandar=myClient.a_op,uuid=uuid)
+    object = comm_opMessage.objects.get(pk=uuid)
+    object.bDone = True
+    object.save()
+
     return view_op_caldav(request)
 
 def view_vhc_edit_caldav(request, uuid):
@@ -72,10 +89,23 @@ def view_road_caldav(request):
     return HttpResponse(template.render(context, request))
 @xframe_options_exempt
 def view_op_caldav(request):
-    o_caldav = cls_caldav(url=caldav_cfg["op"])
-    o_caldav.get_caldav_data(periode=1)
+    o_items = comm_opMessage.objects.filter(bDone=False, dtStart__lte= datetime.today() + timedelta(days=1))
+    all_items = []
+    for item in o_items:
+        temp_item = caldav_item()
+        temp_item.uuid = item.uuid
+        temp_item.name = item.sTitle
+        temp_item.desc = item.sDesc
+        temp_item.key = item.sKey
+        temp_item.str_start_date = str(item.dtStart.day) + "." + str(item.dtStart.month)
+        if item.dtEnd != None:
+            temp_item.str_end_date = str(item.dtEnd.day) + "." + str(item.dtEnd.month)
+        else:
+            temp_item.str_end_date = None
+        all_items.append(temp_item)
+
     template = loader.get_template("op/op_view.html")
-    context = {'latest_task_list': o_caldav.items}
+    context = {'latest_task_list': all_items}
     return HttpResponse(template.render(context, request))
 
 @xframe_options_exempt