From 39a2626c3adc6bd1db11615fcd38673a2e6b0c50 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Tue, 1 Mar 2022 20:43:53 +0100
Subject: [PATCH] Fix warnings

---
 ui/src/components/CorrectionResponses.svelte |  1 -
 ui/src/components/QuestionForm.svelte        | 32 --------------------
 ui/src/components/SurveyList.svelte          | 23 +++++++-------
 ui/src/routes/surveys/[sid]/index.svelte     |  2 +-
 ui/src/routes/surveys/new.svelte             |  6 ++--
 5 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/ui/src/components/CorrectionResponses.svelte b/ui/src/components/CorrectionResponses.svelte
index e36b584..4ddd669 100644
--- a/ui/src/components/CorrectionResponses.svelte
+++ b/ui/src/components/CorrectionResponses.svelte
@@ -9,7 +9,6 @@
 
  export let cts = null;
  export let filter = "";
- export let hilights = "";
  export let question = null;
  export let proposals = null;
  export let notCorrected = false;
diff --git a/ui/src/components/QuestionForm.svelte b/ui/src/components/QuestionForm.svelte
index 07515f1..6a11e9f 100644
--- a/ui/src/components/QuestionForm.svelte
+++ b/ui/src/components/QuestionForm.svelte
@@ -138,37 +138,5 @@
                 {survey}
             />
         {/if}
-
-        {#if false}
-            <div ng-controller="ProposalsController" ng-if="question.kind == 'ucq' || question.kind == 'mcq'">
-                <div class="form-group form-check" ng-if="!question.edit && question.kind == 'mcq'" ng-repeat="proposal in proposals">
-                    <input type="checkbox" class="form-check-input" id="p{proposal.id}" ng-model="question['p' + proposal.id]" disabled={readonly}>
-                    <label class="form-check-label" for="p{proposal.id}">{proposal.label}</label>
-                </div>
-                <div class="form-group form-check" ng-if="!question.edit && question.kind == 'ucq'" ng-repeat="proposal in proposals">
-                    <input type="radio" class="form-check-input" name="proposals{question.id}" id="p{proposal.id}" ng-model="question.value" value="{proposal.id}" disabled={survey.readonly}>
-                    <label class="form-check-label" for="p{proposal.id}">{proposal.label}</label>
-                </div>
-                <div class="form-group row" ng-if="question.edit" ng-repeat="proposal in proposals">
-                    <div class="col">
-                        <input type="text" class="form-control" id="pi{proposal.id}" placeholder="Label" ng-model="proposal.label">
-                    </div>
-                    <div class="col-auto">
-                        <button type="button" class="btn btn-success ml-1" ng-click="saveProposal()" ng-if="question.edit && (question.kind == 'ucq' || question.kind == 'mcq')"><i class="bi bi-check" ></i></button>
-                        <button type="button" class="btn btn-danger ml-1" ng-click="deleteProposal()" ng-if="question.edit && (question.kind == 'ucq' || question.kind == 'mcq')"><i class="bi bi-trash-fill"></i></button>
-                    </div>
-                </div>
-                <button type="button" class="btn btn-info ml-1" ng-click="addProposal()" ng-if="question.edit && (question.kind == 'ucq' || question.kind == 'mcq')" ng-disabled="!question.id"><i class="bi bi-plus"></i> Ajouter des proposals
-                </button><span ng-show="question.edit && (question.kind == 'ucq' || question.kind == 'mcq') && !question.id" class="ml-2" style="font-style:italic"> Créez la question pour ajouter des propositions</span>
-            </div>
-            <div class="ml-3 card-text alert alert-success" ng-if="!question.edit && (question.response.score_explaination || question.response.score)">
-                <div class="row">
-                    <div class="col-auto">
-                        <strong>{question.response.score}&nbsp;%</strong>
-                    </div>
-                    <p class="col mb-0" style="white-space: pre-line">{question.response.score_explaination}</p>
-                </div>
-            </div>
-        {/if}
     </div>
 </div>
diff --git a/ui/src/components/SurveyList.svelte b/ui/src/components/SurveyList.svelte
index 48e6c1b..89d214a 100644
--- a/ui/src/components/SurveyList.svelte
+++ b/ui/src/components/SurveyList.svelte
@@ -63,17 +63,18 @@
                               <DateFormat date={survey.end_availability} dateStyle="medium" timeStyle="medium" />
                           </td>
                       {/if}
-                      {#if !$user}
-                      {:else if !survey.corrected}
-                          <td>N/A</td>
-                      {:else}
-                          <td>
-                              {#await getScore(survey)}
-                                  <div class="spinner-border spinner-border-sm" role="status"></div>
-                              {:then score}
-                                  {score.score}
-                              {/await}
-                          </td>
+                      {#if $user}
+                          {#if !survey.corrected}
+                              <td>N/A</td>
+                          {:else}
+                              <td>
+                                  {#await getScore(survey)}
+                                      <div class="spinner-border spinner-border-sm" role="status"></div>
+                                  {:then score}
+                                      {score.score}
+                                  {/await}
+                              </td>
+                          {/if}
                       {/if}
                   </tr>
               {/if}
diff --git a/ui/src/routes/surveys/[sid]/index.svelte b/ui/src/routes/surveys/[sid]/index.svelte
index 8df6da5..39847c5 100644
--- a/ui/src/routes/surveys/[sid]/index.svelte
+++ b/ui/src/routes/surveys/[sid]/index.svelte
@@ -51,7 +51,7 @@
         <SurveyBadge class="ms-2" {survey} />
     </div>
 
-    {#if $user.is_admin && edit}
+    {#if $user && $user.is_admin && edit}
         <SurveyAdmin {survey} on:saved={() => edit = false} />
     {/if}
 
diff --git a/ui/src/routes/surveys/new.svelte b/ui/src/routes/surveys/new.svelte
index 2c77210..2a4f626 100644
--- a/ui/src/routes/surveys/new.svelte
+++ b/ui/src/routes/surveys/new.svelte
@@ -1,12 +1,10 @@
-<script lang="ts">
+<script>
  import { goto } from '$app/navigation';
 
  import { user } from '../../stores/user';
  import SurveyAdmin from '../../components/SurveyAdmin.svelte';
  import SurveyBadge from '../../components/SurveyBadge.svelte';
- import SurveyQuestions from '../../components/SurveyQuestions.svelte';
  import { Survey } from '../../lib/surveys';
- import { getQuestions } from '../../lib/questions';
 
  let survey = new Survey();
 </script>
@@ -19,6 +17,6 @@
     <SurveyBadge class="ms-2" {survey} />
 </div>
 
-{#if $user.is_admin}
+{#if $user && $user.is_admin}
     <SurveyAdmin {survey} on:saved={(e) => { goto(`surveys/${e.detail.id}`)}} />
 {/if}