Merge pull request #261 from openHPI/feature/la-dashboard

Add LA dashboard architecture

app/views/exercises/external_users/statistics.html.slim

@@ -58,7 +58,7 @@ h1 = "#{@exercise} (external user #{@external_user})"
                 td =
                 td =
                 td = @working_times_until[index] if index > 0
-    p = t('.addendum')
+    p = t('.addendum', delta: StatisticsHelper::WORKING_TIME_DELTA_IN_SECONDS / 60)
     .d-none#wtimes data-working_times=ActiveSupport::JSON.encode(@working_times_until);
     div#progress_chart.col-lg-12
       .graph-functions-2

app/views/exercises/study_group_dashboard.html.slim

@@ -0,0 +1,37 @@
+- content_for :head do
+  // Force a full page reload, see https://github.com/turbolinks/turbolinks/issues/326.
+     Otherwise, code might not be highlighted correctly (race condition)
+  meta name='turbolinks-visit-control' content='reload'
+  = javascript_pack_tag('d3-tip', 'data-turbolinks-track': true)
+
+h1
+  = t('.live_dashboard')
+
+div.teacher_dashboard data-exercise-id="#{@exercise.id}" data-study-group-id="#{@study_group_id}"
+
+h4.mt-4
+  = t('.time_spent_per_learner')
+
+.d-none#initial_graph_data data-graph_data=ActiveSupport::JSON.encode(@graph_data);
+div.w-100#chart_stacked
+
+.d-none.badge-info.container.py-2#no_chart_data
+  i class="fa fa-info" aria-hidden="true"
+  = t('.no_data_yet')
+
+h4.mt-4
+  = t('.related_requests_for_comments')
+
+.table-responsive
+  table.table.table-hover.mt-4
+    thead
+      tr
+        th.text-center
+          i.mr-0 class="fa fa-lightbulb-o" aria-hidden="true" title = t('request_for_comments.solved')
+        th.text-center
+          i.mr-0 class="fa fa-comment" aria-hidden="true" title = t('request_for_comments.comments') align="center"
+        th.col-12 = t('activerecord.attributes.request_for_comments.question')
+        th = t('activerecord.attributes.request_for_comments.username')
+        th.text-nowrap = t('activerecord.attributes.request_for_comments.requested_at')
+    tbody#posted_rfcs
+      = render(partial: 'request_for_comments/list_entry', collection: @request_for_comments, as: :request_for_comment)

app/views/layouts/application.html.slim

@@ -5,6 +5,7 @@ html lang='en'
     meta name='viewport' content='width=device-width, initial-scale=1'
     title = application_name
     link href=asset_path('favicon.png') rel='icon' type='image/png'
+    = action_cable_meta_tag
     = stylesheet_pack_tag('application', media: 'all', 'data-turbolinks-track': true)
     = stylesheet_pack_tag('stylesheets', media: 'all', 'data-turbolinks-track': true)
     = stylesheet_link_tag('application', media: 'all', 'data-turbolinks-track': true)
@@ -12,6 +13,10 @@ html lang='en'
     = javascript_include_tag('application', 'data-turbolinks-track': true)
     = yield(:head)
     = csrf_meta_tags
+    = timeago_script_tag
+    script type="text/javascript"
+      | I18n.defaultLocale = "#{I18n.default_locale}";
+      | I18n.locale = "#{I18n.locale}";
   body
     - unless @embed_options[:hide_navbar]
       nav.navbar.navbar-dark.bg-dark.navbar-expand-md.mb-4.py-1 role='navigation'

app/views/request_for_comments/_list_entry.html.slim

@@ -0,0 +1,15 @@
+tr.table-row-clickable data-id=request_for_comment.id data-href=request_for_comment_path(request_for_comment)
+  td.p-2
+    - if request_for_comment.solved?
+      span.fa.fa-check.fa-2x.text-success aria-hidden="true"
+    - elsif request_for_comment.full_score_reached
+      span.fa.fa-check.fa-2x style="color:darkgrey" aria-hidden="true"
+    - else
+      = ''
+  td.text-center = request_for_comment.comments_count
+  - if request_for_comment.has_attribute?(:question) && request_for_comment.question.present?
+    td.text-primary = truncate(request_for_comment.question, length: 200)
+  - else
+    td.text-black-50.font-italic = t('request_for_comments.no_question')
+  td = request_for_comment.user
+  td = timeago_tag request_for_comment.created_at

app/views/request_for_comments/show.html.slim

@@ -9,6 +9,9 @@
     - testruns = Testrun.where(:submission_id => @request_for_comment.submission)
     = link_to_if(policy(user).show?, user.displayname, user)
     | | #{@request_for_comment.created_at.localtime}
+    - if @request_for_comment.submission.study_group.present? && policy(@request_for_comment.submission).show_study_group?
+      = ' | '
+      = link_to_if(policy(@request_for_comment.submission.study_group).show?, @request_for_comment.submission.study_group, @request_for_comment.submission.study_group)
   .rfc
     .description
       h5

app/views/submissions/show.html.slim

@@ -9,6 +9,7 @@ h1 = @submission
 
 = row(label: 'submission.exercise', value: link_to_if(policy(@submission.exercise).show?, @submission.exercise, @submission.exercise))
 = row(label: 'submission.user', value: link_to_if(policy(@submission.user).show?, @submission.user, @submission.user))
+= row(label: 'submission.study_group', value: link_to_if(policy(@submission.study_group).show?, @submission.study_group, @submission.study_group))
 = row(label: 'submission.cause', value: t("submissions.causes.#{@submission.cause}"))
 = row(label: 'submission.score', value: @submission.score)
 

app/views/user_mailer/send_thank_you_note.slim

@@ -1,5 +1,5 @@
 == t('mailers.user_mailer.send_thank_you_note.body',
         receiver_displayname: @receiver_displayname,
         link_to_comment: link_to(@rfc_link, @rfc_link),
-        author: @author.displayname,
+        author: @author,
         thank_you_note: @thank_you_note )