Merge pull request #1964 from tomudding/fix/company-update-language-t…

…oggle-not-working fix: language toggle not working for company update form
GEWIS · Jan 6, 2025 · 1efd96a · 1efd96a
2 parents 3614742 + 4d4a397
commit 1efd96a
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 54 deletions.
diff --git a/module/Company/view/company/admin/add-company.phtml b/module/Company/view/company/admin/add-company.phtml
@@ -17,7 +17,7 @@ $this->headTitle($this->translate('Create Company'));
 
 $this->headScript()
     ->appendFile(
-        $this->basepath('js/company-create.js'),
+        $this->basepath('js/company-admin.js'),
         'text/javascript',
         ['nonce' => NONCE_REPLACEMENT_STRING],
     )
@@ -68,7 +68,7 @@ $form->setAttribute('class', 'form-company');
 </div>
 <?= $this->form()->closeTag() ?>
 <script nonce="<?= NONCE_REPLACEMENT_STRING ?>">
-    Company.updateForm();
+    Company.Admin.updateForm();
 
     GEDITOR.MarkdownCompanyEditor
         .create(document.querySelector('#description-nl'), {

diff --git a/module/Company/view/company/admin/add-job.phtml b/module/Company/view/company/admin/add-job.phtml
@@ -19,7 +19,7 @@ $this->headTitle($this->translate('Add Job'));
 
 $this->headScript()
     ->appendFile(
-        $this->basepath('js/company-create.js'),
+        $this->basepath('js/company-admin.js'),
         'text/javascript',
         ['nonce' => NONCE_REPLACEMENT_STRING],
     )
@@ -83,7 +83,7 @@ $form->setAttribute('class', 'form-company');
 </div>
 <?= $this->form()->closeTag() ?>
 <script nonce="<?= NONCE_REPLACEMENT_STRING ?>">
-    Company.updateForm();
+    Company.Admin.updateForm();
     Job.updateAllLabels();
     $('label[for^="labels-"]').on('click', function () {
         Job.toggleLabel($(this).data('label-id'));

diff --git a/module/Company/view/company/admin/add-label.phtml b/module/Company/view/company/admin/add-label.phtml
@@ -15,7 +15,7 @@ $this->headTitle($this->translate('Create Job Label'));
 
 $this->headScript()
     ->appendFile(
-        $this->basepath('js/company-create.js'),
+        $this->basepath('js/company-admin.js'),
         'text/javascript',
         ['nonce' => NONCE_REPLACEMENT_STRING],
     );
@@ -50,6 +50,6 @@ $form->setAttribute('class', 'form-company');
 </div>
 <?= $this->form()->closeTag() ?>
 <script nonce="<?= NONCE_REPLACEMENT_STRING ?>">
-    Company.updateForm();
+    Company.Admin.updateForm();
 </script>
 
diff --git a/module/Company/view/company/admin/add-package.phtml b/module/Company/view/company/admin/add-package.phtml
@@ -16,7 +16,7 @@ $this->headTitle($this->translate('Add Package'));
 
 $this->headScript()
     ->appendFile(
-        $this->basepath('js/company-create.js'),
+        $this->basepath('js/company-admin.js'),
         'text/javascript',
         ['nonce' => NONCE_REPLACEMENT_STRING],
     );
@@ -52,6 +52,6 @@ $form->setAttribute('class', 'form-company');
 </div>
 <?= $this->form()->closeTag() ?>
 <script nonce="<?= NONCE_REPLACEMENT_STRING ?>">
-    Company.updateForm();
+    Company.Admin.updateForm();
 </script>
 
diff --git a/module/Company/view/company/admin/edit-company.phtml b/module/Company/view/company/admin/edit-company.phtml
@@ -29,7 +29,7 @@ $this->breadcrumbs()
 
 $this->headScript()
     ->appendFile(
-        $this->basepath('js/company-create.js'),
+        $this->basepath('js/company-admin.js'),
         'text/javascript',
         ['nonce' => NONCE_REPLACEMENT_STRING],
     )
@@ -58,13 +58,6 @@ if ($isCompany) {
     $uploadPath = '/admin/career/company/edit/' . $company->getSlugName() . '/upload';
 }
 
-$this->inlineScript()
-    ->appendFile(
-        $this->basepath('js/company-admin.js'),
-        'text/javascript',
-        ['nonce' => NONCE_REPLACEMENT_STRING],
-    );
-
 $this->scriptUrl()->requireUrls(
     [
         'company_admin/company/edit/package/delete'
@@ -246,7 +239,7 @@ $form->setAttribute('class', 'form-company');
     </div>
 </div>
 <script nonce="<?= NONCE_REPLACEMENT_STRING ?>">
-    Company.updateForm();
+    Company.Admin.updateForm();
 
     document.querySelectorAll('.delete-package').forEach(companyPackage => {
         companyPackage.addEventListener('click', e => {

diff --git a/module/Company/view/company/admin/edit-job.phtml b/module/Company/view/company/admin/edit-job.phtml
@@ -24,7 +24,7 @@ $this->headTitle($this->translate('Edit Job'));
 
 $this->headScript()
     ->appendFile(
-        $this->basepath('js/company-create.js'),
+        $this->basepath('js/company-admin.js'),
         'text/javascript',
         ['nonce' => NONCE_REPLACEMENT_STRING],
     )
@@ -120,7 +120,7 @@ $form->setAttribute('class', 'form-company');
 </div>
 <?= $this->form()->closeTag() ?>
 <script nonce="<?= NONCE_REPLACEMENT_STRING ?>">
-    Company.updateForm();
+    Company.Admin.updateForm();
     Job.updateAllLabels();
     $('label[for^="labels-"]').on('click', function () {
         Job.toggleLabel($(this).data('label-id'));

diff --git a/module/Company/view/company/admin/edit-label.phtml b/module/Company/view/company/admin/edit-label.phtml
@@ -15,7 +15,7 @@ $this->headTitle($this->translate('Edit Job Label'));
 
 $this->headScript()
     ->appendFile(
-        $this->basepath('js/company-create.js'),
+        $this->basepath('js/company-admin.js'),
         'text/javascript',
         ['nonce' => NONCE_REPLACEMENT_STRING],
     );
@@ -50,6 +50,6 @@ $form->setAttribute('class', 'form-company');
 </div>
 <?= $this->form()->closeTag() ?>
 <script nonce="<?= NONCE_REPLACEMENT_STRING ?>">
-    Company.updateForm();
+    Company.Admin.updateForm();
 </script>
 
diff --git a/module/Company/view/company/admin/edit-package.phtml b/module/Company/view/company/admin/edit-package.phtml
@@ -20,7 +20,7 @@ $this->headTitle($this->translate('Edit Package'));
 
 $this->headScript()
     ->appendFile(
-        $this->basepath('js/company-create.js'),
+        $this->basepath('js/company-admin.js'),
         'text/javascript',
         ['nonce' => NONCE_REPLACEMENT_STRING],
     );
@@ -164,7 +164,7 @@ $form->setAttribute('class', 'form-company');
     </div>
 </div>
 <script nonce="<?= NONCE_REPLACEMENT_STRING ?>">
-    Company.updateForm();
+    Company.Admin.updateForm();
 
     document.querySelectorAll('.delete-job').forEach(job => {
         job.addEventListener('click', e => {

diff --git a/module/Company/view/partial/company/admin/editors/company.phtml b/module/Company/view/partial/company/admin/editors/company.phtml
@@ -330,7 +330,7 @@ use Laminas\View\Renderer\PhpRenderer;
 <script nonce="<?= NONCE_REPLACEMENT_STRING ?>">
     document.querySelectorAll('.language-control').forEach(checkbox => {
         checkbox.addEventListener('click', () => {
-            Company.updateForm();
+            Company.Admin.updateForm();
         });
     });
 </script>
diff --git a/module/Company/view/partial/company/admin/editors/job.phtml b/module/Company/view/partial/company/admin/editors/job.phtml
@@ -372,7 +372,7 @@ use Laminas\View\Renderer\PhpRenderer;
 <script nonce="<?= NONCE_REPLACEMENT_STRING ?>">
     document.querySelectorAll('.language-control').forEach(checkbox => {
         checkbox.addEventListener('click', () => {
-            Company.updateForm();
+            Company.Admin.updateForm();
         });
     });
 </script>
diff --git a/module/Company/view/partial/company/admin/editors/label.phtml b/module/Company/view/partial/company/admin/editors/label.phtml
@@ -109,7 +109,7 @@ use Laminas\View\Renderer\PhpRenderer;
 <script nonce="<?= NONCE_REPLACEMENT_STRING ?>">
     document.querySelectorAll('.language-control').forEach(checkbox => {
         checkbox.addEventListener('click', () => {
-            Company.updateForm();
+            Company.Admin.updateForm();
         });
     });
 </script>
diff --git a/module/Company/view/partial/company/admin/editors/package.phtml b/module/Company/view/partial/company/admin/editors/package.phtml
@@ -172,7 +172,7 @@ use Laminas\View\Renderer\PhpRenderer;
 <script nonce="<?= NONCE_REPLACEMENT_STRING ?>">
     document.querySelectorAll('.language-control').forEach(checkbox => {
         checkbox.addEventListener('click', () => {
-            Company.updateForm();
+            Company.Admin.updateForm();
         });
     });
 </script>
diff --git a/public/js/company-admin.js b/public/js/company-admin.js
@@ -56,5 +56,26 @@ Company.Admin = {
             'companySlugName': companySlugName,
             'packageId': packageId
         }));
-    }
+    },
+
+    /**
+     * Updates the form to accommodate changes in the language checkboxes.
+     */
+    updateForm: function () {
+        if ($('[name="language_dutch"]').is(':checked')) {
+            $('.form-control-dutch').removeAttr('disabled');
+            $('label[for$="-nl"]').addClass('label-required');
+        } else {
+            $('.form-control-dutch').attr('disabled', 'disabled');
+            $('label[for$="-nl"]').removeClass('label-required');
+        }
+
+        if ($('[name="language_english"]').is(':checked')) {
+            $('.form-control-english').removeAttr('disabled');
+            $('label[for$="-en"]').addClass('label-required');
+        } else {
+            $('.form-control-english').attr('disabled', 'disabled');
+            $('label[for$="-en"]').removeClass('label-required');
+        }
+    },
 };
diff --git a/public/js/company-create.js b/public/js/company-create.js