diff --git a/Reskreen/settings.py b/Reskreen/settings.py
index 39d53ee..e20462a 100644
--- a/Reskreen/settings.py
+++ b/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',
diff --git a/comm_op/__init__.py b/comm_op/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/comm_op/admin.py b/comm_op/admin.py
new file mode 100644
index 0000000..36ee0c0
--- /dev/null
+++ b/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)
diff --git a/comm_op/apps.py b/comm_op/apps.py
new file mode 100644
index 0000000..5f76ac8
--- /dev/null
+++ b/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"
diff --git a/comm_op/models.py b/comm_op/models.py
new file mode 100644
index 0000000..c04aedd
--- /dev/null
+++ b/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"
\ No newline at end of file
diff --git a/comm_op/tests.py b/comm_op/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/comm_op/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/comm_op/views.py b/comm_op/views.py
new file mode 100644
index 0000000..91ea44a
--- /dev/null
+++ b/comm_op/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
diff --git a/mycaldav/templates/op/op_view.html b/mycaldav/templates/op/op_view.html
index 0cbbea4..798ca29 100644
--- a/mycaldav/templates/op/op_view.html
+++ b/mycaldav/templates/op/op_view.html
@@ -12,11 +12,10 @@
{% if task.done %}
{{task.key}}
{% else %}
- {{task.key}}
+ {{task.key}}
{% endif %}
- {{task.str_start_date}} - {{task.str_end_date}}
- {{task.str_start_time}} - {{task.str_end_time}}
+ {{task.str_start_date}} {% if task.str_end_date != None %}- {{task.str_end_date}} {% endif %}