oups

app/scodoc/sco_edt_cal.py

@@ -256,39 +256,7 @@ def _load_and_convert_ics(formsemestre: FormSemestre) -> list[dict]:
                     "end": event.decoded("dtend").isoformat(),
                 }
             )
-<<<<<<< HEAD
-            # --- Lien saisie abs
-            link_abs = (
-                f"""<div class="module-edt link-abs"><a class="stdlink" href="{
-                        url_for("assiduites.signal_assiduites_group",
-                                scodoc_dept=g.scodoc_dept,
-                                formsemestre_id=formsemestre.id,
-                                moduleimpl_id=modimpl.id,
-                                jour = event.decoded("dtstart").date().isoformat(),
-                                group_ids=group.id,
-                        )}">absences</a>
-            </div>"""
-                if modimpl and group
-                else ""
-            )
-            d = {
-                # Champs utilisés par tui.calendar
-                "calendarId": "cal1",
-                "title": extract_event_title(event) + group_disp + mod_disp + link_abs,
-                "start": event.decoded("dtstart").isoformat(),
-                "end": event.decoded("dtend").isoformat(),
-                "backgroundColor": background_color,
-                # Infos brutes pour usage API éventuel
-                "group_id": group.id if group else None,
-                "group_edt_id": edt_group,
-                "moduleimpl_id": modimpl.id if modimpl else None,
-            }
-            events_dict.append(d)
-
-    return events_dict
-=======
     return events_sco
->>>>>>> edt
 
 
 def extract_event_data(