Several bugfixes for sci-types-department

sci-types-department/src/main/java/org/scientificcms/contenttypes/scidepartment/ui/SciDepartmentCreateStep.java

@@ -1,13 +1,16 @@
 package org.scientificcms.contenttypes.scidepartment.ui;
 
 import org.libreccm.l10n.GlobalizationHelper;
+import org.libreccm.l10n.LocalizedString;
+import org.libreccm.workflow.Workflow;
 import org.librecms.contentsection.ContentItemManager;
 import org.librecms.contentsection.ContentItemRepository;
 import org.librecms.ui.contentsections.documents.AbstractMvcDocumentCreateStep;
 import org.scientificcms.contenttypes.scidepartment.SciDepartment;
-import org.scientificcms.contenttypes.sciproject.SciProject;
 
+import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
@@ -118,7 +121,7 @@ public class SciDepartmentCreateStep
                 .stream()
                 .filter(
                     type -> type.getContentItemClass().equals(
-                        SciProject.class.getName()
+                        SciDepartment.class.getName()
                     )
                 )
                 .findAny()
@@ -140,8 +143,124 @@ public class SciDepartmentCreateStep
     }
 
     @Override
-    public String createItem(Map<String, String[]> maps) {
+    public String createItem(final Map<String, String[]> formParams) {
-        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
+        if (!formParams.containsKey(FORM_PARAM_NAME)
+                || formParams.get(FORM_PARAM_NAME) == null
+                || formParams.get(FORM_PARAM_NAME).length == 0) {
+            addMessage(
+                "danger",
+                globalizationHelper
+                    .getLocalizedTextsUtil(getBundle())
+                    .getText("createstep.name.error.missing")
+            );
+            return showCreateStep();
+        }
+
+        name = formParams.get(FORM_PARAM_NAME)[0];
+        if (!name.matches("^([a-zA-Z0-9_-]*)$")) {
+            addMessage(
+                "danger",
+                globalizationHelper
+                    .getLocalizedTextsUtil(getBundle())
+                    .getText("createstep.name.error.invalid")
+            );
+            return showCreateStep();
+        }
+
+        if (!formParams.containsKey(FORM_PARAM_TITLE)
+                || formParams.get(FORM_PARAM_TITLE) == null
+                || formParams.get(FORM_PARAM_TITLE).length == 0) {
+            addMessage(
+                "danger",
+                globalizationHelper
+                    .getLocalizedTextsUtil(getBundle())
+                    .getText("createstep.title.error.missing")
+            );
+            return showCreateStep();
+        }
+        title = formParams.get(FORM_PARAM_TITLE)[0];
+
+        if (!formParams.containsKey(FORM_PARAM_SHORT_DESCRIPTION)
+                || formParams.get(FORM_PARAM_SHORT_DESCRIPTION) == null
+                || formParams.get(FORM_PARAM_SHORT_DESCRIPTION).length == 0) {
+            addMessage(
+                "danger",
+                globalizationHelper
+                    .getLocalizedTextsUtil(getBundle())
+                    .getText("createstep.summary.error.missing")
+            );
+            return showCreateStep();
+        }
+        shortDescription = formParams.get(FORM_PARAM_SHORT_DESCRIPTION)[0];
+
+        if (!formParams.containsKey(FORM_PARAM_INITIAL_LOCALE)
+                || formParams.get(FORM_PARAM_INITIAL_LOCALE) == null
+                || formParams.get(FORM_PARAM_INITIAL_LOCALE).length == 0) {
+            addMessage(
+                "danger",
+                globalizationHelper.getLocalizedTextsUtil(
+                    getBundle()
+                ).getText("createstep.initial_locale.error.missing")
+            );
+            return showCreateStep();
+        }
+        final Locale locale = new Locale(
+            formParams.get(FORM_PARAM_INITIAL_LOCALE)[0]
+        );
+
+        if (!formParams.containsKey(FORM_PARAM_SELECTED_WORKFLOW)
+                || formParams.get(FORM_PARAM_SELECTED_WORKFLOW) == null
+                || formParams.get(FORM_PARAM_SELECTED_WORKFLOW).length == 0) {
+            addMessage(
+                "danger",
+                globalizationHelper.getLocalizedTextsUtil(
+                    getBundle()
+                ).getText("createstep.workflow.none_selected")
+            );
+            return showCreateStep();
+        }
+
+        selectedWorkflow = formParams.get(FORM_PARAM_SELECTED_WORKFLOW)[0];
+
+        final Optional<Workflow> workflowResult = getContentSection()
+            .getWorkflowTemplates()
+            .stream()
+            .filter(template -> template.getUuid().equals(selectedWorkflow))
+            .findAny();
+
+        if (!workflowResult.isPresent()) {
+            addMessage(
+                "danger",
+                globalizationHelper.getLocalizedTextsUtil(
+                    getBundle()
+                ).getText("createstep.workflow.error.not_available")
+            );
+            return showCreateStep();
+        }
+
+        if (!getMessages().isEmpty()) {
+            return showCreateStep();
+        }
+
+        final SciDepartment department = itemManager.createContentItem(
+            name,
+            getContentSection(),
+            getFolder(),
+            workflowResult.get(),
+            SciDepartment.class,
+            locale
+        );
+        
+        department.getTitle().putValue(locale, title);
+        department.getShortDescription().putValue(locale, shortDescription);
+        itemRepo.save(department);
+        
+        return String.format(
+            "redirect:%s/documents/%s/%s/@scidepartment-basicproperties",
+            getContentSectionLabel(),
+            getFolderPath(),
+            name
+        );
     }
 
 }

sci-types-department/src/main/java/org/scientificcms/contenttypes/scidepartment/ui/SciDepartmentDescriptionMembersModel.java

@@ -37,7 +37,7 @@ public class SciDepartmentDescriptionMembersModel {
         return Collections.unmodifiableList(members);
     }
 
-    protected void setMembers(final List<SciDepartmentMembershipModel> member) {
+    protected void setMembers(final List<SciDepartmentMembershipModel> members) {
         this.members = new ArrayList<>(members);
     }
 

sci-types-department/src/main/java/org/scientificcms/contenttypes/scidepartment/ui/SciDepartmentDescriptionStep.java

@@ -1086,10 +1086,15 @@ public class SciDepartmentDescriptionStep extends AbstractMvcAuthoringStep {
             );
             textsModel.setAvailableTextKeys(
                 texts
-                .keySet()
+                .entrySet()
                 .stream()
-                .filter(key -> !textsModel.getTexts().containsKey(key))
+                .filter(entry -> !textsModel.getTexts().containsKey(entry.getKey()))
-                .collect(Collectors.toList())
+                .collect(
+                    Collectors.toMap(
+                        entry -> entry.getKey(),
+                        entry -> entry.getValue()
+                    )
+                )
             );
 
             contactsModel.setCanEdit(canEdit);

sci-types-department/src/main/java/org/scientificcms/contenttypes/scidepartment/ui/SciDepartmentTextsModel.java

@@ -1,10 +1,10 @@
 package org.scientificcms.contenttypes.scidepartment.ui;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
+import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.SortedMap;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
@@ -19,7 +19,7 @@ public class SciDepartmentTextsModel {
 
     private boolean canEdit;
     
-    private List<String> availableTextKeys;
+    private Map<String, String> availableTextKeys;
 
     private Map<String, SciDepartmentTextModel> texts;
 
@@ -35,12 +35,14 @@ public class SciDepartmentTextsModel {
         this.canEdit = canEdit;
     }
     
-    public List<String> getAvailableTextKeys() {
+    public Map<String, String> getAvailableTextKeys() {
-        return Collections.unmodifiableList(availableTextKeys);
+        return Collections.unmodifiableMap(availableTextKeys);
     }
     
-    protected void setAvailableTextKeys(final List<String> availableTextKeys) {
+    protected void setAvailableTextKeys(
-        this.availableTextKeys = new ArrayList<>(availableTextKeys);
+        final Map<String, String> availableTextKeys
+    ) {
+        this.availableTextKeys = new LinkedHashMap<>(availableTextKeys);
     }
 
     public Map<String, SciDepartmentTextModel> getTexts() {
@@ -48,7 +50,7 @@ public class SciDepartmentTextsModel {
     }
 
     protected void setTexts(final Map<String, SciDepartmentTextModel> texts) {
-        this.texts = new HashMap<>(texts);
+        this.texts = new LinkedHashMap<>(texts);
     }
 
     public String getSelectedText() {

sci-types-department/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/scidepartment/ui/create-scidepartment.xhtml

@@ -52,9 +52,9 @@
                     <bootstrap:formGroupTextarea
                         cols="80"
                         help="#{SciDepartmentMessageBundle['createform.summary.help']}"
-                        inputId="summary"
+                        inputId="shortdesc"
                         label="#{SciDepartmentMessageBundle['createform.summary.label']}"
-                        name="summary"
+                        name="shortdesc"
                         required="true"
                         rows="16"
                         value="#{SciDepartmentCreateStep.shortDescription}"

sci-types-department/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/scidepartment/ui/scidepartment-basic-properties.xhtml

@@ -36,6 +36,7 @@
                      tabindex="-1">
                     <div class="modal-dialog">
                         <form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@scidepartment-basicproperties/name"
+                              class="modal-content"
                               method="post">
                             <div class="modal-header">
                                 <h4 class="modal-title"

sci-types-department/src/main/resources/db/migrations/org/scientificcms/sci_types_department/h2/V7_0_0_0__create_tables.sql

@@ -1,13 +1,30 @@
-    create table SCI_TYPES_PROJECT.PROJECT_CONTACTS (
+create table SCI_TYPES_DEPARTMENT.DEPARTMENT_ADDENDUM (
+       OBJECT_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (OBJECT_ID, LOCALE)
+    );
+
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_ADDENDUM_AUD (
+       REV integer not null,
+        OBJECT_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
+        LOCALE varchar(255) not null,
+        REVTYPE tinyint,
+        REVEND integer,
+        primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+    );
+
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_CONTACTS (
        CONTACT_ID bigint not null,
         CONTACT_TYPE varchar(255),
         CONTACT_ORDER bigint,
         CONTACTABLE_ID bigint,
-        PROJECT_ID bigint,
+        DEPARTMENT_ID bigint,
         primary key (CONTACT_ID)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECT_CONTACTS_AUD (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_CONTACTS_AUD (
        CONTACT_ID bigint not null,
         REV integer not null,
         REVTYPE tinyint,
@@ -15,18 +32,18 @@
         CONTACT_TYPE varchar(255),
         CONTACT_ORDER bigint,
         CONTACTABLE_ID bigint,
-        PROJECT_ID bigint,
+        DEPARTMENT_ID bigint,
         primary key (CONTACT_ID, REV)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECT_DESCS (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_DESCS (
        OBJECT_ID bigint not null,
         LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECT_DESCS_AUD (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_DESCS_AUD (
        REV integer not null,
         OBJECT_ID bigint not null,
         LOCALIZED_VALUE varchar(2147483647) not null,
@@ -36,69 +53,52 @@
         primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECT_FUNDING (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_MEMBERSHIPS (
-       OBJECT_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table SCI_TYPES_PROJECT.PROJECT_FUNDING_AUD (
-       REV integer not null,
-        OBJECT_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647) not null,
-        LOCALE varchar(255) not null,
-        REVTYPE tinyint,
-        REVEND integer,
-        primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
-    );
-
-    create table SCI_TYPES_PROJECT.PROJECT_FUNDING_VOLUME (
-       OBJECT_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table SCI_TYPES_PROJECT.PROJECT_FUNDING_VOLUME_AUD (
-       REV integer not null,
-        OBJECT_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647) not null,
-        LOCALE varchar(255) not null,
-        REVTYPE tinyint,
-        REVEND integer,
-        primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
-    );
-
-    create table SCI_TYPES_PROJECT.PROJECT_MEMBERSHIPS (
        MEMBERSHIP_ID bigint not null,
         MEMBER_ROLE varchar(255),
         STATUS varchar(255),
+        DEPARTMENT_ID bigint,
         MEMBER_ID bigint,
-        PROJECT_ID bigint,
         primary key (MEMBERSHIP_ID)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECT_MEMBERSHIPS_AUD (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_MEMBERSHIPS_AUD (
        MEMBERSHIP_ID bigint not null,
         REV integer not null,
         REVTYPE tinyint,
         REVEND integer,
         MEMBER_ROLE varchar(255),
         STATUS varchar(255),
+        DEPARTMENT_ID bigint,
         MEMBER_ID bigint,
-        PROJECT_ID bigint,
         primary key (MEMBERSHIP_ID, REV)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECT_SHORT_DESCS (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_PROJECTS (
+       DEPARTMENT_PROJECT_ID bigint not null,
+        DEPARTMENT_ID bigint,
+        PROJECT_ID bigint,
+        primary key (DEPARTMENT_PROJECT_ID)
+    );
+
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_PROJECTS_AUD (
+       DEPARTMENT_PROJECT_ID bigint not null,
+        REV integer not null,
+        REVTYPE tinyint,
+        REVEND integer,
+        DEPARTMENT_ID bigint,
+        PROJECT_ID bigint,
+        primary key (DEPARTMENT_PROJECT_ID, REV)
+    );
+
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_SHORT_DESCS (
        OBJECT_ID bigint not null,
         LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECT_SHORT_DESCS_AUD (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_SHORT_DESCS_AUD (
        REV integer not null,
         OBJECT_ID bigint not null,
         LOCALIZED_VALUE varchar(2147483647) not null,
@@ -108,168 +108,195 @@
         primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECTS (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXT_VALUES (
-       PROJECT_BEGIN date,
-        PROJECT_END date,
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table SCI_TYPES_PROJECT.PROJECTS_AUD (
        OBJECT_ID bigint not null,
-        REV integer not null,
+        LOCALIZED_VALUE varchar(2147483647),
-        PROJECT_BEGIN date,
+        LOCALE varchar(255) not null,
-        PROJECT_END date,
+        primary key (OBJECT_ID, LOCALE)
-        primary key (OBJECT_ID, REV)
     );
 
-    create table SCI_TYPES_PROJECT.SPONSORING (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXT_VALUES_AUD (
-       SPONSORING_ID bigint not null,
+       REV integer not null,
-        FUNDING_CODE varchar(512),
+        OBJECT_ID bigint not null,
-        SPONSOR_ORDER bigint,
+        LOCALIZED_VALUE varchar(2147483647) not null,
-        PROJECT_ID bigint,
+        LOCALE varchar(255) not null,
-        SPONSOR_ID bigint,
+        REVTYPE tinyint,
-        primary key (SPONSORING_ID)
+        REVEND integer,
+        primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
     );
 
-    create table SCI_TYPES_PROJECT.SPONSORING_AUD (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXTS (
-       SPONSORING_ID bigint not null,
+       TEXT_ID bigint not null,
+        key varchar(255) not null,
+        CONTACT_ORDER bigint,
+        DEPARTMENT_ID bigint,
+        additionalTexts_KEY varchar(255),
+        primary key (TEXT_ID)
+    );
+
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXTS_AUD (
+       TEXT_ID bigint not null,
         REV integer not null,
         REVTYPE tinyint,
         REVEND integer,
-        FUNDING_CODE varchar(512),
+        key varchar(255),
-        SPONSOR_ORDER bigint,
+        CONTACT_ORDER bigint,
-        PROJECT_ID bigint,
+        DEPARTMENT_ID bigint,
-        SPONSOR_ID bigint,
+        primary key (TEXT_ID, REV)
-        primary key (SPONSORING_ID, REV)
     );
 
-    alter table SCI_TYPES_PROJECT.PROJECT_CONTACTS 
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENTS (
-       add constraint FKgnma88ye77fb0vdmpuepyb2y7 
+       OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENTS_AUD (
+       OBJECT_ID bigint not null,
+        REV integer not null,
+        primary key (OBJECT_ID, REV)
+    );
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_ADDENDUM 
+       add constraint FKkr6pwbcsp0qxafbxbgwqa11ay 
+       foreign key (OBJECT_ID) 
+       references SCI_TYPES_DEPARTMENT.DEPARTMENTS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_ADDENDUM_AUD 
+       add constraint FKelrcnq39r31r0l519afl15qay 
+       foreign key (REV) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_ADDENDUM_AUD 
+       add constraint FKl2uuj3krtky6ouk99n1vaujs4 
+       foreign key (REVEND) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_CONTACTS 
+       add constraint FK61b1pvrsuxxt0ajyhmu6vgp8f 
        foreign key (CONTACTABLE_ID) 
        references CCM_CMS.CONTACTABLE_ENTITIES;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_CONTACTS 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_CONTACTS 
-       add constraint FK21fku49mpakv86hra725t3sok 
+       add constraint FK2rk6b5rwwhypbhlwxfvfg34bp 
-       foreign key (PROJECT_ID) 
+       foreign key (DEPARTMENT_ID) 
-       references SCI_TYPES_PROJECT.PROJECTS;
+       references SCI_TYPES_DEPARTMENT.DEPARTMENTS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_CONTACTS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_CONTACTS_AUD 
-       add constraint FK15m4nnwrt964isduiuk8bbeg8 
+       add constraint FK7hxnvivdkm7ullkb3x33w89qa 
        foreign key (REV) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_CONTACTS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_CONTACTS_AUD 
-       add constraint FKciyhqi7w2dby8e3b4arklmfqp 
+       add constraint FKe2m5dgvrbh28yuetflg847k9p 
        foreign key (REVEND) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_DESCS 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_DESCS 
-       add constraint FKfh5goal8j4gsjhf65gxm11gxu 
+       add constraint FKtkxxxyb2r0oeljttm3vg1ek1c 
        foreign key (OBJECT_ID) 
-       references SCI_TYPES_PROJECT.PROJECTS;
+       references SCI_TYPES_DEPARTMENT.DEPARTMENTS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_DESCS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_DESCS_AUD 
-       add constraint FKfq5fyp71qmrc9y0h6px8vae7l 
+       add constraint FKtfrxdrq4x3fvne2qnum009h9m 
        foreign key (REV) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_DESCS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_DESCS_AUD 
-       add constraint FK6615a6cc9tcmovk51a9vqff7x 
+       add constraint FKfoygb3t7vg4a6kwedec9gnfgc 
        foreign key (REVEND) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_FUNDING 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_MEMBERSHIPS 
-       add constraint FKqmq8depjmuly0lixjljwnwut5 
+       add constraint FKswvausrj6rpiuewwky4966o8w 
-       foreign key (OBJECT_ID) 
+       foreign key (DEPARTMENT_ID) 
-       references SCI_TYPES_PROJECT.PROJECTS;
+       references SCI_TYPES_DEPARTMENT.DEPARTMENTS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_FUNDING_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_MEMBERSHIPS 
-       add constraint FK664s3oomoj23e9hvbh97hg5dw 
+       add constraint FKl7xexed4rkmd8849fs87wcikf 
-       foreign key (REV) 
-       references CCM_CORE.CCM_REVISIONS;
-
-    alter table SCI_TYPES_PROJECT.PROJECT_FUNDING_AUD 
-       add constraint FKgtsw7ruamw5m1p15p5y261a23 
-       foreign key (REVEND) 
-       references CCM_CORE.CCM_REVISIONS;
-
-    alter table SCI_TYPES_PROJECT.PROJECT_FUNDING_VOLUME 
-       add constraint FKf6lg5n24snpplnvctdknh4mrv 
-       foreign key (OBJECT_ID) 
-       references SCI_TYPES_PROJECT.PROJECTS;
-
-    alter table SCI_TYPES_PROJECT.PROJECT_FUNDING_VOLUME_AUD 
-       add constraint FKgnnop98oxffgs7bp9bspajhw9 
-       foreign key (REV) 
-       references CCM_CORE.CCM_REVISIONS;
-
-    alter table SCI_TYPES_PROJECT.PROJECT_FUNDING_VOLUME_AUD 
-       add constraint FKk599wppcylm8yo704ht3w7ibj 
-       foreign key (REVEND) 
-       references CCM_CORE.CCM_REVISIONS;
-
-    alter table SCI_TYPES_PROJECT.PROJECT_MEMBERSHIPS 
-       add constraint FKdbcet4i6wg7jinmaa0wchqujp 
        foreign key (MEMBER_ID) 
        references CCM_CMS.PERSONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_MEMBERSHIPS 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_MEMBERSHIPS_AUD 
-       add constraint FK54cqbnqwnv7e13p7k842nmjvt 
+       add constraint FKnueow1dk4s148ddigm1smh5l6 
+       foreign key (REV) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_MEMBERSHIPS_AUD 
+       add constraint FKb4k1r14kxplvq5yvls3mc9wg7 
+       foreign key (REVEND) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_PROJECTS 
+       add constraint FK44ec63uxo6tfkbicbx7m0au9x 
+       foreign key (DEPARTMENT_ID) 
+       references SCI_TYPES_DEPARTMENT.DEPARTMENTS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_PROJECTS 
+       add constraint FKqo3qvk46erndngcg3s9g5g0y2 
        foreign key (PROJECT_ID) 
        references SCI_TYPES_PROJECT.PROJECTS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_MEMBERSHIPS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_PROJECTS_AUD 
-       add constraint FKjdf8o2a5cuusgee0v43n562y4 
+       add constraint FKg2wdr3xj8vmctvusi9dmu6nby 
        foreign key (REV) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_MEMBERSHIPS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_PROJECTS_AUD 
-       add constraint FK7yfj65ojma1coq2eeywpu0fcp 
+       add constraint FKaail9qrssr6m2whdi85ill2xn 
        foreign key (REVEND) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_SHORT_DESCS 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_SHORT_DESCS 
-       add constraint FKqbbb85ebs497yad3gx07kdt1e 
+       add constraint FKhjjjhfgyubyc7dqv7cwylynib 
        foreign key (OBJECT_ID) 
-       references SCI_TYPES_PROJECT.PROJECTS;
+       references SCI_TYPES_DEPARTMENT.DEPARTMENTS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_SHORT_DESCS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_SHORT_DESCS_AUD 
-       add constraint FK4ijysk1fk31o5kljgpc2p7yq6 
+       add constraint FK1avu0wp25u2qol0h6u8gv5itg 
        foreign key (REV) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_SHORT_DESCS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_SHORT_DESCS_AUD 
-       add constraint FKkmidmqbpihxhfu1349lcw0rb0 
+       add constraint FKjv8lhvqcodppyow6x7qqodbe4 
        foreign key (REVEND) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECTS 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXT_VALUES 
-       add constraint FKqlmls86i354oxprglxg5j9xxy 
+       add constraint FKq9e443yyn5x582n0gv8dkox2q 
+       foreign key (OBJECT_ID) 
+       references SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXTS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXT_VALUES_AUD 
+       add constraint FKbtj714r1oclsq27js49fpsfx1 
+       foreign key (REV) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXT_VALUES_AUD 
+       add constraint FKimyfv8v61io9kox2atqswk7iy 
+       foreign key (REVEND) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXTS 
+       add constraint FKc5fi9md95eldjfpeaqtfplqab 
+       foreign key (DEPARTMENT_ID) 
+       references SCI_TYPES_DEPARTMENT.DEPARTMENTS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXTS_AUD 
+       add constraint FKb8ani402kr1vng8kdqhvaxum6 
+       foreign key (REV) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXTS_AUD 
+       add constraint FK1r1yt6d7l6g1xqgbmu6s2pdb4 
+       foreign key (REVEND) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENTS 
+       add constraint FKmya9o3si7s3wu50quhlapy5dc 
        foreign key (OBJECT_ID) 
        references CCM_CMS.CONTENT_ITEMS;
 
-    alter table SCI_TYPES_PROJECT.PROJECTS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENTS_AUD 
-       add constraint FKss0w64wsb71r39npak6tg963b 
+       add constraint FKet2pdc2rct7iisg420vtworwm 
        foreign key (OBJECT_ID, REV) 
        references CCM_CMS.CONTENT_ITEMS_AUD;
-
-    alter table SCI_TYPES_PROJECT.SPONSORING 
-       add constraint FKe8posjrbtsvd7t8q3k8l7ybmy 
-       foreign key (PROJECT_ID) 
-       references SCI_TYPES_PROJECT.PROJECTS;
-
-    alter table SCI_TYPES_PROJECT.SPONSORING 
-       add constraint FKt63gl8j92rua5risu9cnhd3py 
-       foreign key (SPONSOR_ID) 
-       references CCM_CMS.ORGANIZATIONS;
-
-    alter table SCI_TYPES_PROJECT.SPONSORING_AUD 
-       add constraint FK7ci9e1fuqi8vbjcp9x70747se 
-       foreign key (REV) 
-       references CCM_CORE.CCM_REVISIONS;
-
-    alter table SCI_TYPES_PROJECT.SPONSORING_AUD 
-       add constraint FKfa0ems4hsww6wgoapss1bx38f 
-       foreign key (REVEND) 
-       references CCM_CORE.CCM_REVISIONS;

sci-types-department/src/main/resources/db/migrations/org/scientificcms/sci_types_department/pgsql/V7_0_0_0__create_tables.sql

@@ -1,13 +1,30 @@
-    create table SCI_TYPES_PROJECT.PROJECT_CONTACTS (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_ADDENDUM (
+       OBJECT_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (OBJECT_ID, LOCALE)
+    );
+
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_ADDENDUM_AUD (
+       REV int4 not null,
+        OBJECT_ID int8 not null,
+        LOCALIZED_VALUE text not null,
+        LOCALE varchar(255) not null,
+        REVTYPE int2,
+        REVEND int4,
+        primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
+    );
+
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_CONTACTS (
        CONTACT_ID int8 not null,
         CONTACT_TYPE varchar(255),
         CONTACT_ORDER int8,
         CONTACTABLE_ID int8,
-        PROJECT_ID int8,
+        DEPARTMENT_ID int8,
         primary key (CONTACT_ID)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECT_CONTACTS_AUD (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_CONTACTS_AUD (
        CONTACT_ID int8 not null,
         REV int4 not null,
         REVTYPE int2,
@@ -15,18 +32,18 @@
         CONTACT_TYPE varchar(255),
         CONTACT_ORDER int8,
         CONTACTABLE_ID int8,
-        PROJECT_ID int8,
+        DEPARTMENT_ID int8,
         primary key (CONTACT_ID, REV)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECT_DESCS (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_DESCS (
        OBJECT_ID int8 not null,
         LOCALIZED_VALUE text,
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECT_DESCS_AUD (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_DESCS_AUD (
        REV int4 not null,
         OBJECT_ID int8 not null,
         LOCALIZED_VALUE text not null,
@@ -36,69 +53,52 @@
         primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECT_FUNDING (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_MEMBERSHIPS (
-       OBJECT_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table SCI_TYPES_PROJECT.PROJECT_FUNDING_AUD (
-       REV int4 not null,
-        OBJECT_ID int8 not null,
-        LOCALIZED_VALUE text not null,
-        LOCALE varchar(255) not null,
-        REVTYPE int2,
-        REVEND int4,
-        primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
-    );
-
-    create table SCI_TYPES_PROJECT.PROJECT_FUNDING_VOLUME (
-       OBJECT_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table SCI_TYPES_PROJECT.PROJECT_FUNDING_VOLUME_AUD (
-       REV int4 not null,
-        OBJECT_ID int8 not null,
-        LOCALIZED_VALUE text not null,
-        LOCALE varchar(255) not null,
-        REVTYPE int2,
-        REVEND int4,
-        primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
-    );
-
-    create table SCI_TYPES_PROJECT.PROJECT_MEMBERSHIPS (
        MEMBERSHIP_ID int8 not null,
         MEMBER_ROLE varchar(255),
         STATUS varchar(255),
+        DEPARTMENT_ID int8,
         MEMBER_ID int8,
-        PROJECT_ID int8,
         primary key (MEMBERSHIP_ID)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECT_MEMBERSHIPS_AUD (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_MEMBERSHIPS_AUD (
        MEMBERSHIP_ID int8 not null,
         REV int4 not null,
         REVTYPE int2,
         REVEND int4,
         MEMBER_ROLE varchar(255),
         STATUS varchar(255),
+        DEPARTMENT_ID int8,
         MEMBER_ID int8,
-        PROJECT_ID int8,
         primary key (MEMBERSHIP_ID, REV)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECT_SHORT_DESCS (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_PROJECTS (
+       DEPARTMENT_PROJECT_ID int8 not null,
+        DEPARTMENT_ID int8,
+        PROJECT_ID int8,
+        primary key (DEPARTMENT_PROJECT_ID)
+    );
+
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_PROJECTS_AUD (
+       DEPARTMENT_PROJECT_ID int8 not null,
+        REV int4 not null,
+        REVTYPE int2,
+        REVEND int4,
+        DEPARTMENT_ID int8,
+        PROJECT_ID int8,
+        primary key (DEPARTMENT_PROJECT_ID, REV)
+    );
+
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_SHORT_DESCS (
        OBJECT_ID int8 not null,
         LOCALIZED_VALUE text,
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECT_SHORT_DESCS_AUD (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_SHORT_DESCS_AUD (
        REV int4 not null,
         OBJECT_ID int8 not null,
         LOCALIZED_VALUE text not null,
@@ -108,168 +108,195 @@
         primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
     );
 
-    create table SCI_TYPES_PROJECT.PROJECTS (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXT_VALUES (
-       PROJECT_BEGIN date,
-        PROJECT_END date,
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table SCI_TYPES_PROJECT.PROJECTS_AUD (
        OBJECT_ID int8 not null,
-        REV int4 not null,
+        LOCALIZED_VALUE text,
-        PROJECT_BEGIN date,
+        LOCALE varchar(255) not null,
-        PROJECT_END date,
+        primary key (OBJECT_ID, LOCALE)
-        primary key (OBJECT_ID, REV)
     );
 
-    create table SCI_TYPES_PROJECT.SPONSORING (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXT_VALUES_AUD (
-       SPONSORING_ID int8 not null,
+       REV int4 not null,
-        FUNDING_CODE varchar(512),
+        OBJECT_ID int8 not null,
-        SPONSOR_ORDER int8,
+        LOCALIZED_VALUE text not null,
-        PROJECT_ID int8,
+        LOCALE varchar(255) not null,
-        SPONSOR_ID int8,
+        REVTYPE int2,
-        primary key (SPONSORING_ID)
+        REVEND int4,
+        primary key (REV, OBJECT_ID, LOCALIZED_VALUE, LOCALE)
     );
 
-    create table SCI_TYPES_PROJECT.SPONSORING_AUD (
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXTS (
-       SPONSORING_ID int8 not null,
+       TEXT_ID int8 not null,
+        key varchar(255) not null,
+        CONTACT_ORDER int8,
+        DEPARTMENT_ID int8,
+        additionalTexts_KEY varchar(255),
+        primary key (TEXT_ID)
+    );
+
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXTS_AUD (
+       TEXT_ID int8 not null,
         REV int4 not null,
         REVTYPE int2,
         REVEND int4,
-        FUNDING_CODE varchar(512),
+        key varchar(255),
-        SPONSOR_ORDER int8,
+        CONTACT_ORDER int8,
-        PROJECT_ID int8,
+        DEPARTMENT_ID int8,
-        SPONSOR_ID int8,
+        primary key (TEXT_ID, REV)
-        primary key (SPONSORING_ID, REV)
     );
 
-    alter table SCI_TYPES_PROJECT.PROJECT_CONTACTS 
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENTS (
-       add constraint FKgnma88ye77fb0vdmpuepyb2y7 
+       OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table SCI_TYPES_DEPARTMENT.DEPARTMENTS_AUD (
+       OBJECT_ID int8 not null,
+        REV int4 not null,
+        primary key (OBJECT_ID, REV)
+    );
+
+alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_ADDENDUM 
+       add constraint FKkr6pwbcsp0qxafbxbgwqa11ay 
+       foreign key (OBJECT_ID) 
+       references SCI_TYPES_DEPARTMENT.DEPARTMENTS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_ADDENDUM_AUD 
+       add constraint FKelrcnq39r31r0l519afl15qay 
+       foreign key (REV) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_ADDENDUM_AUD 
+       add constraint FKl2uuj3krtky6ouk99n1vaujs4 
+       foreign key (REVEND) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_CONTACTS 
+       add constraint FK61b1pvrsuxxt0ajyhmu6vgp8f 
        foreign key (CONTACTABLE_ID) 
        references CCM_CMS.CONTACTABLE_ENTITIES;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_CONTACTS 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_CONTACTS 
-       add constraint FK21fku49mpakv86hra725t3sok 
+       add constraint FK2rk6b5rwwhypbhlwxfvfg34bp 
-       foreign key (PROJECT_ID) 
+       foreign key (DEPARTMENT_ID) 
-       references SCI_TYPES_PROJECT.PROJECTS;
+       references SCI_TYPES_DEPARTMENT.DEPARTMENTS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_CONTACTS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_CONTACTS_AUD 
-       add constraint FK15m4nnwrt964isduiuk8bbeg8 
+       add constraint FK7hxnvivdkm7ullkb3x33w89qa 
        foreign key (REV) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_CONTACTS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_CONTACTS_AUD 
-       add constraint FKciyhqi7w2dby8e3b4arklmfqp 
+       add constraint FKe2m5dgvrbh28yuetflg847k9p 
        foreign key (REVEND) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_DESCS 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_DESCS 
-       add constraint FKfh5goal8j4gsjhf65gxm11gxu 
+       add constraint FKtkxxxyb2r0oeljttm3vg1ek1c 
        foreign key (OBJECT_ID) 
-       references SCI_TYPES_PROJECT.PROJECTS;
+       references SCI_TYPES_DEPARTMENT.DEPARTMENTS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_DESCS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_DESCS_AUD 
-       add constraint FKfq5fyp71qmrc9y0h6px8vae7l 
+       add constraint FKtfrxdrq4x3fvne2qnum009h9m 
        foreign key (REV) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_DESCS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_DESCS_AUD 
-       add constraint FK6615a6cc9tcmovk51a9vqff7x 
+       add constraint FKfoygb3t7vg4a6kwedec9gnfgc 
        foreign key (REVEND) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_FUNDING 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_MEMBERSHIPS 
-       add constraint FKqmq8depjmuly0lixjljwnwut5 
+       add constraint FKswvausrj6rpiuewwky4966o8w 
-       foreign key (OBJECT_ID) 
+       foreign key (DEPARTMENT_ID) 
-       references SCI_TYPES_PROJECT.PROJECTS;
+       references SCI_TYPES_DEPARTMENT.DEPARTMENTS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_FUNDING_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_MEMBERSHIPS 
-       add constraint FK664s3oomoj23e9hvbh97hg5dw 
+       add constraint FKl7xexed4rkmd8849fs87wcikf 
-       foreign key (REV) 
-       references CCM_CORE.CCM_REVISIONS;
-
-    alter table SCI_TYPES_PROJECT.PROJECT_FUNDING_AUD 
-       add constraint FKgtsw7ruamw5m1p15p5y261a23 
-       foreign key (REVEND) 
-       references CCM_CORE.CCM_REVISIONS;
-
-    alter table SCI_TYPES_PROJECT.PROJECT_FUNDING_VOLUME 
-       add constraint FKf6lg5n24snpplnvctdknh4mrv 
-       foreign key (OBJECT_ID) 
-       references SCI_TYPES_PROJECT.PROJECTS;
-
-    alter table SCI_TYPES_PROJECT.PROJECT_FUNDING_VOLUME_AUD 
-       add constraint FKgnnop98oxffgs7bp9bspajhw9 
-       foreign key (REV) 
-       references CCM_CORE.CCM_REVISIONS;
-
-    alter table SCI_TYPES_PROJECT.PROJECT_FUNDING_VOLUME_AUD 
-       add constraint FKk599wppcylm8yo704ht3w7ibj 
-       foreign key (REVEND) 
-       references CCM_CORE.CCM_REVISIONS;
-
-    alter table SCI_TYPES_PROJECT.PROJECT_MEMBERSHIPS 
-       add constraint FKdbcet4i6wg7jinmaa0wchqujp 
        foreign key (MEMBER_ID) 
        references CCM_CMS.PERSONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_MEMBERSHIPS 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_MEMBERSHIPS_AUD 
-       add constraint FK54cqbnqwnv7e13p7k842nmjvt 
+       add constraint FKnueow1dk4s148ddigm1smh5l6 
+       foreign key (REV) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_MEMBERSHIPS_AUD 
+       add constraint FKb4k1r14kxplvq5yvls3mc9wg7 
+       foreign key (REVEND) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_PROJECTS 
+       add constraint FK44ec63uxo6tfkbicbx7m0au9x 
+       foreign key (DEPARTMENT_ID) 
+       references SCI_TYPES_DEPARTMENT.DEPARTMENTS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_PROJECTS 
+       add constraint FKqo3qvk46erndngcg3s9g5g0y2 
        foreign key (PROJECT_ID) 
        references SCI_TYPES_PROJECT.PROJECTS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_MEMBERSHIPS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_PROJECTS_AUD 
-       add constraint FKjdf8o2a5cuusgee0v43n562y4 
+       add constraint FKg2wdr3xj8vmctvusi9dmu6nby 
        foreign key (REV) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_MEMBERSHIPS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_PROJECTS_AUD 
-       add constraint FK7yfj65ojma1coq2eeywpu0fcp 
+       add constraint FKaail9qrssr6m2whdi85ill2xn 
        foreign key (REVEND) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_SHORT_DESCS 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_SHORT_DESCS 
-       add constraint FKqbbb85ebs497yad3gx07kdt1e 
+       add constraint FKhjjjhfgyubyc7dqv7cwylynib 
        foreign key (OBJECT_ID) 
-       references SCI_TYPES_PROJECT.PROJECTS;
+       references SCI_TYPES_DEPARTMENT.DEPARTMENTS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_SHORT_DESCS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_SHORT_DESCS_AUD 
-       add constraint FK4ijysk1fk31o5kljgpc2p7yq6 
+       add constraint FK1avu0wp25u2qol0h6u8gv5itg 
        foreign key (REV) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECT_SHORT_DESCS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_SHORT_DESCS_AUD 
-       add constraint FKkmidmqbpihxhfu1349lcw0rb0 
+       add constraint FKjv8lhvqcodppyow6x7qqodbe4 
        foreign key (REVEND) 
        references CCM_CORE.CCM_REVISIONS;
 
-    alter table SCI_TYPES_PROJECT.PROJECTS 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXT_VALUES 
-       add constraint FKqlmls86i354oxprglxg5j9xxy 
+       add constraint FKq9e443yyn5x582n0gv8dkox2q 
+       foreign key (OBJECT_ID) 
+       references SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXTS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXT_VALUES_AUD 
+       add constraint FKbtj714r1oclsq27js49fpsfx1 
+       foreign key (REV) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXT_VALUES_AUD 
+       add constraint FKimyfv8v61io9kox2atqswk7iy 
+       foreign key (REVEND) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXTS 
+       add constraint FKc5fi9md95eldjfpeaqtfplqab 
+       foreign key (DEPARTMENT_ID) 
+       references SCI_TYPES_DEPARTMENT.DEPARTMENTS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXTS_AUD 
+       add constraint FKb8ani402kr1vng8kdqhvaxum6 
+       foreign key (REV) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENT_TEXTS_AUD 
+       add constraint FK1r1yt6d7l6g1xqgbmu6s2pdb4 
+       foreign key (REVEND) 
+       references CCM_CORE.CCM_REVISIONS;
+
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENTS 
+       add constraint FKmya9o3si7s3wu50quhlapy5dc 
        foreign key (OBJECT_ID) 
        references CCM_CMS.CONTENT_ITEMS;
 
-    alter table SCI_TYPES_PROJECT.PROJECTS_AUD 
+    alter table SCI_TYPES_DEPARTMENT.DEPARTMENTS_AUD 
-       add constraint FKss0w64wsb71r39npak6tg963b 
+       add constraint FKet2pdc2rct7iisg420vtworwm 
        foreign key (OBJECT_ID, REV) 
-       references CCM_CMS.CONTENT_ITEMS_AUD;
+       references CCM_CMS.CONTENT_ITEMS_AUD;
-
-    alter table SCI_TYPES_PROJECT.SPONSORING 
-       add constraint FKe8posjrbtsvd7t8q3k8l7ybmy 
-       foreign key (PROJECT_ID) 
-       references SCI_TYPES_PROJECT.PROJECTS;
-
-    alter table SCI_TYPES_PROJECT.SPONSORING 
-       add constraint FKt63gl8j92rua5risu9cnhd3py 
-       foreign key (SPONSOR_ID) 
-       references CCM_CMS.ORGANIZATIONS;
-
-    alter table SCI_TYPES_PROJECT.SPONSORING_AUD 
-       add constraint FK7ci9e1fuqi8vbjcp9x70747se 
-       foreign key (REV) 
-       references CCM_CORE.CCM_REVISIONS;
-
-    alter table SCI_TYPES_PROJECT.SPONSORING_AUD 
-       add constraint FKfa0ems4hsww6wgoapss1bx38f 
-       foreign key (REVEND) 
-       references CCM_CORE.CCM_REVISIONS;

sci-types-department/src/main/resources/org/scientificcms/contenttypes/scidepartment/ui/SciDepartmentBundle.properties

@@ -6,8 +6,8 @@ scidepartment.edit.denied=Access denied.
 authoringsteps.basicproperties.description=Basicproperties of the department.
 authoringsteps.basicproperties.label=Basic Properties
 createstep.title=Create a new department description
-createstep.name.help=The name of the new department description. Also used as URL fragment.
+createform.name.help=The name of the new department description. Also used as URL fragment.
-createstep.name.label=Name
+createform.name.label=Name
 createform.initial_locale.help=The initial locale of the department description.
 createform.initial_locale.label=Summary
 createform.title.help=The title of the department.
@@ -143,3 +143,4 @@ description_step.text.header.edit=Edit text {0}
 description_step.texts.header.view=View text {0}
 description_step.edit=Edit
 description_step.description.header.view=Description
+basicproperties.name.edit.submit=Save

sci-types-department/src/main/resources/org/scientificcms/contenttypes/scidepartment/ui/SciDepartmentBundle_de.properties

@@ -6,8 +6,8 @@ scidepartment.edit.denied=Zugriff verweigert.
 authoringsteps.basicproperties.description=Basiseigenschaften der Abteilung.
 authoringsteps.basicproperties.label=Basiseigenschaften
 createstep.title=Neue Abteilungsbeschriebung anlegen
-createstep.name.help=Der Name des neuen Abteilungsbeschreibung. Wird auch als URL-Fragment genutzt.
+createform.name.help=Der Name des neuen Abteilungsbeschreibung. Wird auch als URL-Fragment genutzt.
-createstep.name.label=Name
+createform.name.label=Name
 createform.initial_locale.help=Die initiale Sprache der Abteilungsbeschreibung.
 createform.initial_locale.label=Zusammenfassung
 createform.title.help=Der Titel des Abteilung.
@@ -143,3 +143,4 @@ description_step.text.header.edit=Text {0} bearbeiten
 description_step.texts.header.view=Text {0}
 description_step.edit=Bearbeiten
 description_step.description.header.view=Beschreibung
+basicproperties.name.edit.submit=Speichern