Use dataclass for config objects

Author: dpmpc

web/creator/fotocalendar/bo/config.py

@@ -5,15 +5,15 @@
 from creator.fotocalendar.templates.vintage import VintageFotoCalendar
 from creator.fotocalendar.templates.design2026 import Design2026FotoCalendar
 from creator.fotocalendar.templates.landscape_modern import LandscapeModernFotoCalendar
-from creator.fotocalendar.bo.config import CalendarConfig, DefaultConfig
+from creator.fotocalendar.bo.config import CalendarConfig
 from creator.fotocalendar.icsparser import get_events_from_ics
 from PIL import Image
 from dateutil.relativedelta import relativedelta
 from datetime import datetime
 from copy import deepcopy
 
 
-def create_for_format(format) -> FotoCalendar:
+def create_for_format(format: str) -> FotoCalendar:
     if format == 'L':
         print("Creating LandscapeFotoCalendar for format", format)
         return LandscapeFotoCalendar(False)
@@ -43,7 +43,7 @@ def create_for_format(format) -> FotoCalendar:
         return PortraitFotoCalendar()
 
 
-def get_default_config_for_format(format) -> CalendarConfig:
+def get_default_config_for_format(format: str) -> CalendarConfig:
     first_month = datetime.now()
     if first_month.month > 10:
         first_month = first_month + relativedelta(years=1, month=1, day=1)
@@ -56,7 +56,7 @@ def get_default_config_for_format(format) -> CalendarConfig:
     return config
 
 
-def get_default_config_for_request(request, number_of_months=12) -> CalendarConfig:
+def get_default_config_for_request(request, number_of_months: int = 12) -> CalendarConfig:
     config = get_default_config_for_format(request.POST.get('format', 'P'))
     defaut_config = config.months[0]
     defaut_config.update_from_request(request)
@@ -82,7 +82,7 @@ def get_default_config_for_request(request, number_of_months=12) -> CalendarConf
     return config
 
 
-def get_config_for_request(request) -> DefaultConfig:
+def get_config_for_request(request) -> CalendarConfig:
     config = get_default_config_for_format(request.POST.get('format', 'P'))
     defaut_config = config.months[0]
     config.months = []
@@ -103,8 +103,7 @@ def create_calendar_for_request(request) -> FotoCalendar:
     return create_from_config(config)
 
 
-def create_from_config(config):
-    print("Create from Config", config)
+def create_from_config(config: CalendarConfig) -> FotoCalendar:
     calendar = create_for_format(config.format)
     # if 'title' in config:
     #    calendar.addTitle(config['title'])
@@ -115,7 +114,7 @@ def create_from_config(config):
     return calendar
 
 
-def create_preview_from_request(request):
+def create_preview_from_request(request) -> FotoCalendar:
 
     if request.method == 'POST':
         config = get_default_config_for_request(request, 1)
@@ -159,6 +158,6 @@ def create_preview_from_request(request):
         w = 1000
 
     h = w / float(config.months[0].image_aspect_ratio)
-    config.months[0].image = image.crop((x, y, x + w, y + h))
+    config.months[0].set_image(image.crop((x, y, x + w, y + h)))
 
     return create_from_config(config)

web/creator/fotocalendar/creator.py

@@ -221,49 +221,21 @@ def _dayNameAbbrev(self, dayOfWeek):
         return self._dayNamesAbbrev[dayOfWeek - 1]
 
     def _set_font(self, config: FontConfig):
-        style = self._to_font_style(config)
-        self.fpdf.set_font(style=style, size=config.size, family=config.family)
+        self.fpdf.set_font(style=config.font_style, size=config.size, family=config.family)
         self.fpdf.set_text_color(config.color)
 
     def _set_font_for_day(self, day: DayConfig, config: MonthConfig):
-        if day.is_saturday:
-            self._set_font(config.fonts.saturday)
+        if day.is_holiday:
+            self._set_font(config.fonts.events)
         elif day.is_sunday:
             self._set_font(config.fonts.sunday)
-        elif day.is_holiday:
-            self._set_font(config.fonts.events)
+        elif day.is_saturday:
+            self._set_font(config.fonts.saturday)
         else:
             self._set_font(config.fonts.weekday)
 
-    def _to_font_style(self, config: FontConfig):
-        style = ''
-        if config.bold:
-            style += 'B'
-        if config.italic:
-            style += 'I'
-        if config.underline:
-            style += 'U'
-        return style
-
-    def _hex_color_to_tuple(self, color):
-        if color.startswith('#'):
-            color = color.lstrip('#')
-        return tuple(int(color[i:i + 2], 16) for i in (0, 2, 4))
-
-    def _set_fill_color(self, color):
-        pdf = self.fpdf
-        pdf.set_fill_color(color[0], color[1], color[2])
-
-    def _set_text_color(self, color):
-        pdf = self.fpdf
-        pdf.set_text_color(color[0], color[1], color[2])
-
-    def _set_draw_color(self, color):
-        pdf = self.fpdf
-        pdf.set_draw_color(color[0], color[1], color[2])
-
-    def get_image_aspect_ratio(self):
+    def get_image_aspect_ratio(self) -> str:
         return "{:.2f}".format(self.image_with / self.image_height)
 
     def output(self):
-        return bytes(self.fpdf.output())
+        return bytes(self.fpdf.output())

web/creator/fotocalendar/fotocalendar.py

@@ -2,7 +2,6 @@
 from creator.fotocalendar.bo.config import Event
 
 
-
 def get_events_from_ics(ics_url, start, end):
     print("Setting ics_url: ", ics_url)
     eventlist = {}
@@ -12,6 +11,6 @@ def get_events_from_ics(ics_url, start, end):
             datekey = evt.start.strftime("%Y%m")
             if datekey not in eventlist:
                 eventlist[datekey] = []
-            eventlist[datekey].append(Event(evt.start.strftime("%Y-%m-%d"), evt.summary, False))
+            eventlist[datekey].append(Event(evt.start.strftime, evt.summary, False))
 
     return eventlist

web/creator/fotocalendar/icsparser.py

@@ -27,24 +27,24 @@ def _add_text(self, config, matrix):
         grid_left = pdf.epw - col_width
 
         pdf.set_font(style='B', size=15)
-        self._set_text_color(self.__dark)
-        self._set_draw_color(self.__dark)
-        self._set_fill_color(self.__bg_bright)
+        pdf.set_text_color(self.__dark)
+        pdf.set_draw_color(self.__dark)
+        pdf.set_fill_color(self.__bg_bright)
 
         pdf.set_xy(grid_left, self.tmargin)
         pdf.cell(col_width - 20, 10, txt=self.get_month_name(date), align=config.month_align, new_x="RIGHT", fill=True)
         pdf.cell(20, 10, txt=self._year(date), align="R", new_x="LEFT", new_y="NEXT", fill=True)
 
         for day in matrix:
             if matrix[day].is_sunday or matrix[day].is_holiday:
-                self._set_text_color(self.__fg_bright)
-                self._set_fill_color(self.__medium1)
+                pdf.set_text_color(self.__fg_bright)
+                pdf.set_fill_color(self.__medium1)
             elif matrix[day].is_saturday:
-                self._set_text_color(self.__dark)
-                self._set_fill_color(self.__medium2)
+                pdf.set_text_color(self.__dark)
+                pdf.set_fill_color(self.__medium2)
             else:
-                self._set_text_color(self.__dark)
-                self._set_fill_color(self.__bg_bright)
+                pdf.set_text_color(self.__dark)
+                pdf.set_fill_color(self.__bg_bright)
             pdf.set_x(grid_left)
             pdf.set_font(size=10)
             pdf.cell(7, line_height, txt=matrix[day].day, border='T' if config.table_border else 0, align="R", new_y="TOP", fill=True)
@@ -55,5 +55,5 @@ def _add_text(self, config, matrix):
             pdf.cell(col_width - 7, line_height, txt=text, border='T' if config.table_border else 0, align="L", new_y="NEXT", fill=True)
 
         pdf.set_x(grid_left)
-        self._set_fill_color(self.__bg_bright)
+        pdf.set_fill_color(self.__bg_bright)
         pdf.cell(col_width, 2, txt="", border=config.table_border, fill=True)

web/creator/fotocalendar/templates/design1.py

@@ -4,8 +4,6 @@
 
 class LandscapeModernFotoCalendar(LandscapeFotoCalendar):
     def __init__(self):
-        # super().__init__(False)
-        # self.image_height = 149
         super().__init__(True)
         self.image_height = 167
         self._add_font("MonsieurLaDoulaise")
@@ -23,7 +21,7 @@ def _add_table_background(self, config, x, y, w, h):
         pass
 
     def _add_month_name(self, config):
-        self.fpdf.set_y(177)
+        self.fpdf.set_y(173)
         super()._add_month_name(config)
 
     def _add_days(self, matrix, x, y, width, config):

web/creator/fotocalendar/templates/landscape_modern.py

@@ -73,7 +73,7 @@ def _add_text(self, config, matrix):
 
         if len(events) > 0:
             pdf.ln()
-            self._set_font(config.font.event)
+            self._set_font(config.fonts.event)
             pdf.cell(txt=config.event_separator.join(events), w=pdf.epw, align=config.eventlist_align, new_x="LEFT", new_y="NEXT")
 
     def __toWeekMatrix(self, month_matrix):

web/creator/fotocalendar/templates/portrait.py

@@ -31,7 +31,9 @@
   <div class="tab-content" id="monthTabsContent">
     {% for month in months %}
       <div class="tab-pane fade{% if forloop.first %} show active{% endif %}" id="month_pane_{{ month.id }}" role="tabpanel" aria-labelledby="month_tab_{{ month.id }}" tabindex="0">
-        <input type="hidden" name="date_{{ month.id }}" value="{{ month.date }}" />
+        <input type="hidden" name="id_{{ month.id }}" value="{{ month.id }}" />
+        <input type="hidden" name="name_{{ month.id }}" value="{{ month.name }}" />
+        <input type="hidden" name="date_{{ month.id }}" value="{{ month.date | date:'Y-m-d' }}" />
 
         <div class="container-fluid pt-3">
           <div class="row mb-3">
@@ -79,7 +81,7 @@
               -->
 
               <div class="btn-group">
-                <button type="button" id="button-save-{{ month.id }}" class="btn btn-primary" title="Projekt Speichern" data-bs-toggle="modal" data-bs-target="#upload-images-modal" onclick="uploadImages(true)" disabled>
+                <button type="button" id="button-save-{{ month.id }}" class="btn btn-primary" title="Projekt Speichern" data-bs-toggle="modal" data-bs-target="#upload-images-modal" onclick="uploadImages(true)">
                   <span class="fa fa-floppy-disk"></span> Speichern
                 </button>
               </div>
@@ -112,7 +114,7 @@ <h5 class="mb-3">Termine</h5>
 
           <div class="row  pt-3">
             <div class="col docs-buttons">
-              <button type="button" class="btn btn-primary" onclick="addEvent({{ month.id }}, '{{ month.date }}', '')" >
+              <button type="button" class="btn btn-primary" onclick="addEvent({{ month.id }}, '{{ month.date | date:'Y-m-d' }}', '')" >
                 <span class="fa fa-calendar-plus"></span> Termin hinzufügen
               </button>
             </div>
@@ -250,14 +252,13 @@ <h1 class="modal-title fs-5" id="upload-images-modal-label">Lade Bilder zum Serv
 
   xhr.onload = function() {
     if (xhr.status == 200) {
-      closeModal("upload-images-modal", function() {
-        if (saveProject) {
-          showBlob(xhr.response, "kalender.calendaronline")
-        }
-        else {
-          showBlob(xhr.response, "kalender.pdf")
-        }
-      })
+      if (saveProject) {
+        showBlob(xhr.response, "kalender.calendaronline")
+      }
+      else {
+        showBlob(xhr.response, "kalender.pdf")
+      }
+      closeModal("upload-images-modal")   
     } else {
       closeModal("upload-images-modal")
       console.error("Hochladen der Bilder ist mit Status " + xhr.status + " fehlgeschlagen:", xhr.response);
@@ -311,6 +312,7 @@ <h1 class="modal-title fs-5" id="upload-images-modal-label">Lade Bilder zum Serv
 
 function closeModal(modalId, onClosed) {
   var modalEl = document.getElementById(modalId);
+  const myModalAlternative = new bootstrap.Modal('#myModal', options)
   console.log("Hiding modal with Id " + modalId + " and element ", modalEl)
 
   if (modalEl != null) {
@@ -333,28 +335,30 @@ <h1 class="modal-title fs-5" id="upload-images-modal-label">Lade Bilder zum Serv
 }
 
 function updatePreview(input, id, aspectRatio) {
+  let file = input.files[0];
+  let key = "{{ format }}-" + file.name + "-" + file.size
+  let reader = new FileReader();
+  reader.readAsDataURL(file);
+  reader.onload = function () {
+    setCropperImage(id, aspectRatio, key, reader.result)
+  }
+}
+
+function setCropperImage(id, aspectRatio, key, imageData) {
   let img = document.getElementById("image-preview-" + id);
 
   if (cropper[id]) {
     cropper[id].destroy();
   }
 
-  let file = input.files[0];
-  key = "{{ format }}-" + file.name + "-" + file.size
-
   cropper[id] = enableCropper(img, id, key, aspectRatio);
-
-  let reader = new FileReader();
-  reader.readAsDataURL(file);
-  reader.onload = function () {
-    cropper[id].imageReplaced = true;
-    cropper[id].replace(reader.result);
-  }
+  cropper[id].imageReplaced = true;
+  cropper[id].replace(imageData);
 }
 
 function enableCropper(img, id, storedCropperKey, aspectRatio) {
   var storedCropperData = false
-  if (localStorage.getItem(storedCropperKey)) {
+  if (storedCropperKey && localStorage.getItem(storedCropperKey)) {
     storedCropperData = JSON.parse(localStorage.getItem(storedCropperKey))
   }
 
@@ -383,6 +387,7 @@ <h1 class="modal-title fs-5" id="upload-images-modal-label">Lade Bilder zum Serv
     {% for event in month.events %}
     addEvent({{month.id}}, '{{ event.date }}', '{{ event.text }}', true);
     {% endfor %}
+    {% if month.image %}setCropperImage('{{ month.id }}', '{{month.image_aspect_ratio}}', false, 'data:image/jpeg;base64,{{ month.image }}'){% endif %}
   {% endfor %}
 });
 {% endif %} 

web/creator/templates/creator/months.html

@@ -21,7 +21,7 @@ <h5 class="mb-3">Optionen für den Kalender</h5>
     <div class="row mb-3">
         <label for="startDate" class="col-sm-2 col-form-label">Erster Monat</label>
         <div class="col-sm-10">
-          <input id="startDate" class="form-control" type="date" name="start" value="{{ first_month }}"/>
+          <input id="startDate" class="form-control" type="date" name="start" value="{{ first_month | date:'Y-m-d' }}"/>
           <span id="startDateSelected"></span>
         </div>
     </div>

web/creator/templates/creator/options.html

@@ -32,7 +32,7 @@
     <label class="col-sm-2 col-form-check-label" for="center-month{{ fieldpostfix }}">Montatsname zentriert</label>
     <div class="col-sm-10">
       <div class="form-check form-switch">
-        <input class="form-check-input" type="checkbox" role="switch" id="center-month{{ fieldpostfix }}" name="center_month{{ fieldpostfix }}" value="1"{% if month.center_month %} checked{% endif %}>
+        <input class="form-check-input" type="checkbox" role="switch" id="center-month{{ fieldpostfix }}" name="center_month{{ fieldpostfix }}" value="1"{% if month.month_align == 'C' %} checked{% endif %}>
       </div>
     </div>
   </div>