Fixes

Author: arnaudroy97

src/Apps/StatCan.OrchardCore.Candev/Indexes/Migrations.cs

@@ -16,7 +16,7 @@ public int Create()
             CreateCandevUsersIndex();
             CreateHackathonAvgScoresIndex();
 
-            return 2;
+            return 3;
         }
 
         private void CreateCandevItemsIndex()
@@ -92,7 +92,7 @@ private void CreateCandevUsersIndex()
         private void CreateHackathonAvgScoresIndex()
         {
             SchemaBuilder.CreateReduceIndexTable(typeof(HackathonAvgScoresIndex), table => table
-                .Column<string>("ScoreIndexId", c => c.WithLength(26))
+                .Column<string>("ScoreIndexId", c => c.WithLength(255))
                 .Column<double>("Score")
                 .Column<double>("Count"),
                 null
@@ -107,5 +107,12 @@ public int UpdateFrom1()
 
             return 2;
         }
+
+        public int UpdateFrom2()
+        {
+            SchemaBuilder.AlterTable(nameof(HackathonAvgScoresIndex), table => table.AlterColumn("ScoreIndexId", c => c.WithLength(255)));
+
+            return 3;
+        }
     }
 }

src/Apps/StatCan.OrchardCore.Candev/Views/Widget-JudgingListWidget.liquid

@@ -17,7 +17,6 @@
             <i class="fas fa-signature fa-3x text-muted pt-5 pl-5">{{ "There are no teams." | t }}</i>
           {% else %}
             {% for team in teams %}
-              {% if team.ContentItem.Content.Team.InTheRunning.Value %}
                 {% assign score = Queries.GetScoreEntry | query: teamContentItemId: team.ContentItemId, owner: userId %}
                 {% if team.ContentItem.Content.Team.Challenge.ContentItemIds.first == user.Properties.Judge.Judge.Challenge.ContentItemIds.first
                   and score.size < 1 %}
@@ -31,12 +30,11 @@
                   and score.size == 1 %}
                 <v-container class="pt-5 pl-5">
                   <v-row align="center">
-                    <v-subheader >{{ "Score: " | t }} {{ score.ContentItem.Content.Score.Score.Value }}</v-subheader> 
+                    <v-subheader >{{ "Score: " | t }} {{ score.first.ContentItem.Content.Score.Score.Value }}</v-subheader> 
                     <v-subheader >{{ "Team" | t }} {{ team.DisplayText }}</v-subheader> 
                   </v-row>
                 </v-container>
                 {% endif %}
-              {% endif %}
             {% endfor %}
           {% endif %}
         </div>
@@ -50,21 +48,15 @@
                 {% assign score = Queries.GetScoreEntry | query: teamContentItemId: team.ContentItemId, owner: userId %}
                 <v-container class="pt-5 pl-5">
                   <v-row align="center">
-                {% if team.ContentItem.Content.Team.Challenge.ContentItemIds.first == user.Properties.Judge.Judge.Challenge.ContentItemIds.first
-                  and team.ContentItem.Content.Team.InTheRunning.Value == true
-                  and score.size < 2 %}
-                    <v-btn class="m-5" outlined text href="{{ '~/ScoringPage' | href }}?teamId={{team.ContentItemId}}">Score</v-btn> 
-                {% elsif team.ContentItem.Content.Team.Challenge.ContentItemIds.first != user.Properties.Judge.Judge.Challenge.ContentItemIds.first
-                  and team.ContentItem.Content.Team.InTheRunning.Value == true 
+                {% if team.ContentItem.Content.Team.Challenge.ContentItemIds.first != user.Properties.Judge.Judge.Challenge.ContentItemIds.first
                   and score.size < 1 %}
                     <v-btn class="m-5" outlined text href="{{ '~/ScoringPage' | href }}?teamId={{team.ContentItemId}}">Score</v-btn> 
-                {% endif %}
-                    {% for result in score %}
-                      {% if result.ContentItem.Content.Score.Round.Value == "2" %}
-                      <v-subheader >{{ "Score: " | t }} {{ result.ContentItem.Content.Score.Score.Value }}</v-subheader> 
-                      {% endif %}
-                    {% endfor %}
                     <v-subheader >{{ "Team" | t }} {{ team.DisplayText }}</v-subheader> 
+                {% elsif team.ContentItem.Content.Team.Challenge.ContentItemIds.first != user.Properties.Judge.Judge.Challenge.ContentItemIds.first
+                  and score.size == 1 %}
+                    <v-subheader >{{ "Score: " | t }} {{ score.first.ContentItem.Content.Score.Score.Value }}</v-subheader> 
+                    <v-subheader >{{ "Team" | t }} {{ team.DisplayText }}</v-subheader> 
+                    {% endif %}
                   </v-row>
                 </v-container>
               {% endif %}

src/Apps/StatCan.OrchardCore.Candev/Views/Widget-JudgingResults.liquid

@@ -24,7 +24,7 @@
                 <v-card-text>         
                   <h3>{{ "Statement" | t }}</h3> 
                 	<div>{{ challenge.ContentItem.Content.Challenge.Statement.Text | raw }}</div>
-                  <h3>{{ "Background Information & Potential Datasets" | t }}</h3>
+                  <br>
                 	<div>{{ challenge.ContentItem.Content.MarkdownBodyPart.Markdown | markdownify | raw }}</div>
                   <h3>{{ "Organization" | t }}</h3>
                   {% if Culture.Name == "fr" %}

src/Apps/StatCan.OrchardCore.Candev/Views/Widget-TeamDashboardWidget.liquid

@@ -59,13 +59,19 @@
               <h3>{{ "Statement" | t }}</h3> 
               <v-flex class="pt-2"><span class="subtitle-2">{{ challengeSelected.ContentItem.Content.Challenge.Statement.Text | shortcode }}</span></v-flex>
               {% if Site.Properties.HackathonCustomSettings.TeamCustomSettings.PartialChallenge.Value == false %}
-                <h3>{{ "Background Information & Potential Datasets" | t }}</h3>
+                <br>
                 <v-flex class="pt-2"><span class="subtitle-2">{{ challengeSelected.ContentItem.Content.MarkdownBodyPart.Markdown | markdownify | raw }}</span></v-flex>
               {% endif %}
               <h3>{{ "Organization" | t }}</h3>
-              <v-flex class="pt-2"><span class="subtitle-2">{{ challengeSelected.ContentItem.Content.Challenge.OrganizationNameEn.Text | shortcode }}</span></v-flex>
-              <h3>{{ "Mentors" | t }}</h3>
+              {% if Culture.Name == "fr" %}
+		        <v-tab>{{ challenge.ContentItem.Content.Challenge.OrganizationAcronymFr.Text }}</v-tab>
+              {% else %}
+                <v-tab>{{ challenge.ContentItem.Content.Challenge.OrganizationAcronymEn.Text }}</v-tab>
+              {% endif %}
+              <h3>{{ "Technical mentor" | t }}</h3>
               <v-flex class="pt-2"><span class="subtitle-2">{{ challengeSelected.ContentItem.Content.Challenge.TechnicalMentorName.Text | shortcode }}</span></v-flex>
+              <h3>{{ "Case specialist" | t }}</h3>
+              <v-flex class="pt-2"><span class="subtitle-2">{{ challengeSelected.ContentItem.Content.Challenge.CaseSpecialistName.Text | shortcode }}</span></v-flex>
             </v-card-text>
           </v-card>  
         </v-col>

src/StatCan.OrchardCore.Cms.Web/Localization/fr/StatCan.OrchardCore.Candev.po

@@ -65,7 +65,7 @@ msgstr "L'équipe n'a pas pu être trouvée"
 #. _notifier.Success(H["Successfully left team"]);
 msgctxt "StatCan.OrchardCore.Candev.Controllers.CandevController"
 msgid "Successfully left team"
-msgstr "A quitté l'équipe avec succès"
+msgstr "À quitté l'équipe avec succès"
 
 #: StatCan.OrchardCore.Candev\Controllers\CandevController.cs:151
 #. _notifier.Success(H["Member successfully removed from the team"]);
@@ -472,8 +472,13 @@ msgstr "Organisation"
 
 #: StatCan.OrchardCore.Candev\Views\Widget-TeamDashboardWidget.liquid:0
 msgctxt "StatCan.OrchardCore.Candev.Views.Widget-TeamDashboardWidget"
-msgid "Mentors"
-msgstr "Mentors"
+msgid "Technical mentor"
+msgstr "Mentor technique"
+
+#: StatCan.OrchardCore.Candev\Views\Widget-TeamDashboardWidget.liquid:0
+msgctxt "StatCan.OrchardCore.Candev.Views.Widget-TeamDashboardWidget"
+msgid "Case specialist"
+msgstr "Spécialiste de cas"
 
 #: StatCan.OrchardCore.Candev\Views\Widget-TeamDashboardWidget.liquid:0
 msgctxt "StatCan.OrchardCore.Candev.Views.Widget-TeamDashboardWidget"