Implement Nicky his suggestion

Author: vmcj

webapp/src/Controller/Team/LanguageController.php

@@ -4,6 +4,7 @@
 
 use App\Controller\BaseController;
 use App\Entity\Language;
+use App\Entity\ContestProblem;
 use App\Service\ConfigurationService;
 use App\Service\DOMJudgeService;
 use App\Service\EventLogService;
@@ -33,6 +34,20 @@ public function __construct(
         parent::__construct($em, $eventLogService, $dj, $kernel);
     }
 
+    /**
+     * @param Language[] $languages
+     * @return Language[]
+     */
+    private function addLanguage(array $languages, Language $language, ContestProblem $problem): array
+    {
+        $langId = $language->getName();
+        if (!isset($languages[$langId])) {
+            $languages[$langId] = ['problems' => [], 'language' => $language];
+        }
+        $languages[$langId]['problems'][] = $problem;
+        return $languages;
+    }
+
     #[Route(path: '', name: 'team_languages')]
     public function languagesAction(): Response
     {
@@ -45,20 +60,15 @@ public function languagesAction(): Response
         $limited = false;
         foreach ($this->dj->getCurrentContest()->getProblems() as $problem) {
             foreach ($problem->getProblem()->getLanguages() as $language) {
-                $langId = $language->getName();
-                if (!isset($languages[$langId])) {
-                    $languages[$langId] = ['problems' => [], 'contestlang' => false, 'language' => $language];
-                }
-                $languages[$langId]['problems'][] = $problem;
+                $languages = $this->addLanguage($languages, $language, $problem);
                 $limited = true;
             }
-        }
-        foreach ($this->dj->getAllowedLanguagesForContest($currentContest) as $language) {
-            if (!isset($languages[$language->getName()])) {
-                $languages[$language->getName()] = ['problems' => [], 'contestlang' => true, 'language' => $language];
+            if (count($problem->getProblem()->getLanguages()) == 0) {
+                foreach ($this->dj->getAllowedLanguagesForContest($currentContest) as $language) {
+                    $languages = $this->addLanguage($languages, $language, $problem);
+                }
             }
-            $languages[$language->getName()]['contestlang'] = true;
-        };
+        }
         return $this->render('team/languages.html.twig', ['languages' => $languages, 'limited' => $limited]);
     }
 }

webapp/templates/team/languages.html.twig

@@ -10,7 +10,6 @@
     {% for langarray in languages %}
         {% set lang = langarray['language'] %}
         {% set problems = langarray['problems'] %}
-        {% set contestlang = langarray['contestlang'] %}
                 <div class="col">
                 <div class="card">
                     <div class="card-body">
@@ -24,11 +23,6 @@
                             </span>
                             {% if limited %}
                                 <span style="float: right; font-size:50%;">
-                                    {% if contestlang %}
-                                        <span class="badge problem-badge" style="background-color: #fff; border: 1px solid #000">
-                                            <span style="color: #000">All</span>
-                                        </span>
-                                    {% endif %}
                                     {% for problem in problems %}
                                         {{ problem | problemBadge }}
                                     {% endfor %}