Changeset 17788

Timestamp:

15 May 2024, 07:00:39 (6 months ago)

Author:

Henrik Bettermann

Message:

Adjust to base package.

Location:

main/waeup.uniben/trunk

Files:

• dumper.py (modified) (6 diffs)
• src/waeup/uniben/configuration.py (modified) (3 diffs)

main/waeup.uniben/trunk/dumper.py

@@ -18 +18 @@
     get_students,)
 from waeup.kofa.applicants.export import (
-        ApplicantsContainerExporter,
-        ApplicantRefereeReportExporter,)
+        ApplicantsContainerExporter)
 from waeup.kofa.hostels.export import (
         HostelExporter,
@@ -30 +29 @@
 from waeup.kofa.configuration import ConfigurationContainerExporter
 
-#from kofacustom.nigeria.applicants.export import (
-#        NigeriaApplicantPaymentExporter)
-
 from waeup.uniben.applicants.export import (
         CustomApplicantExporter,
         CustomApplicantPaymentExporter,
-        #CustomApplicantRefereeReportExporter
         )
 from waeup.uniben.students.export import (
@@ -45 +40 @@
         CustomCourseTicketExporter,
         )
-from waeup.uniben.configuration import CustomConfigurationExporter
+try:
+  from waeup.uniben.configuration import CustomSessionConfigurationExporter as SessionConfigurationExporter
+except:
+  from waeup.kofa.configuration import SessionConfigurationExporter
+
+try:
+  from waeup.uniben.applicants import CustomApplicantRefereeReportExporter as ApplicantRefereeReportExporter
+except:
+  from waeup.kofa.applicants.export import ApplicantRefereeReportExporter
+
+try:
+  from waeup.uniben.applicants import CustomApplicantPaymentExporter as ApplicantPaymentExporter
+except:
+  from kofacustom.nigeria.applicants.export import NigeriaApplicantPaymentExporter as ApplicantPaymentExporter
+
 
 exporter_klasses = [
@@ -56 +65 @@
     AccessCodeBatchExporter,
     AccessCodeExporter,
-    CustomConfigurationExporter,
+    SessionConfigurationExporter,
     UserExporter,
     ConfigurationContainerExporter,
@@ -62 +71 @@
     ApplicantsContainerExporter,
     CustomApplicantExporter,
-    CustomApplicantPaymentExporter,
+    ApplicantPaymentExporter,
     ApplicantRefereeReportExporter,
-    #CustomApplicantRefereeReportExporter,
 
     CustomStudentExporter,
@@ -80 +88 @@
     SecondCourseTicketExporter,
     ]
+
+# exporter_klasses = []
 
 def export_all(root):

main/waeup.uniben/trunk/src/waeup/uniben/configuration.py

@@ -26 +26 @@
 from waeup.kofa.configuration import (
     SessionConfigurationFactory, SessionConfiguration,
-    ConfigurationProcessor, ConfigurationExporter)
+    SessionConfigurationProcessor, SessionConfigurationExporter)
 from waeup.uniben.interfaces import (
     ICustomSessionConfiguration, ICustomSessionConfigurationAdd)
@@ -50 +50 @@
         return implementedBy(CustomSessionConfiguration)
 
-class CustomConfigurationExporter(ConfigurationExporter):
+class CustomSessionConfigurationExporter(SessionConfigurationExporter):
     """The Configuration Exporter exports all configuration data. It iterates over all
     objects of the ``configuration`` container.
@@ -56 +56 @@
     fields = tuple(sorted(iface_names(ICustomSessionConfiguration)))
 
-class CustomConfigurationProcessor(ConfigurationProcessor):
+class CustomSessionConfigurationProcessor(SessionConfigurationProcessor):
     """The Configuration Processor processes session configuration objects in
     the ``configuration`` container.