Make mass_add for activities visible

app/models/activity.rb

@@ -176,15 +176,31 @@ class Activity < ApplicationRecord
       st            = Time.strptime(row['start_time'], '%H:%M')
       a.start       = Time.zone.local(sd.year, sd.month, sd.day, st.hour, st.min)
 
-      if not row['end_date'].blank?
+      unless row['end_date'].blank?
         ed          = Date.strptime(row['end_date'])
         et          = Time.strptime(row['end_time'], '%H:%M')
         a.end       = Time.zone.local(ed.year, ed.month, ed.day, et.hour, et.min)
       end
 
-      dd            = Date.strptime(row['deadline_date'])
-      dt            = Time.strptime(row['deadline_time'], '%H:%M')
-      a.deadline    = Time.zone.local(dd.year, dd.month, dd.day, dt.hour, dt.min)
+      unless row['deadline_date'].blank?
+        dd            = Date.strptime(row['deadline_date'])
+        dt            = Time.strptime(row['deadline_time'], '%H:%M')
+        a.deadline    = Time.zone.local(dd.year, dd.month, dd.day, dt.hour, dt.min)
+      end
+
+      unless row['reminder_at_date'].blank?
+        rd            = Date.strptime(row['reminder_at_date'])
+        rt            = Time.strptime(row['reminder_at_time'], '%H:%M')
+        a.reminder_at = Time.zone.local(rd.year, rd.month, rd.day, rt.hour, rt.min)
+      end
+
+      unless row['subgroup_division_enabled'].blank?
+        a.subgroup_division_enabled = row['subgroup_division_enabled'].downcase == 'y'
+      end
+
+      unless row['no_response_action'].blank?
+        a.no_response_action = row['no_response_action'].downcase == 'p'
+      end
 
       result << a
     end

app/views/activities/mass_new.html.haml

@@ -11,6 +11,6 @@
     .col-md-12
       = form_tag(group_activities_mass_new_path(@group), method: 'post', multipart: true) do
         .form-group
-          = file_field_tag 'spreadsheet'
+          = file_field_tag 'spreadsheet', required: true
         .form-group
-          = submit_tag
+          = submit_tag("Go!", class: 'btn btn-warning', confirm: t(:areyousure))

app/views/groups/edit.html.haml

@@ -55,5 +55,7 @@
         = submit_tag(t('defaultsubgroups.destroy'), class: 'btn btn-danger')
 
 .row
-  .col-xs-12
-    = link_to t(:back), @group, class: 'btn btn-default'
+  .col-md-12
+    .btn-group
+      = link_to t(:back), @group, class: 'btn btn-default'
+      = link_to t('activities.mass_import_short'), group_activities_mass_new_path(@group), class: 'btn btn-default'

config/locales/activities/en.yml

@@ -8,6 +8,7 @@ en:
     edit: "Edit activity"
     updated: "Activity updated."
     destroyed: "Activity destroyed."
+    mass_import_short: "Import activities"
     mass_import: "Create multiple activities in %{group}"
     mass_imported: "%{count} activities created!"
 

config/locales/activities/nl.yml

@@ -8,6 +8,7 @@ nl:
     edit: "Activiteit bewerken"
     updated: "Activiteit bijgewerkt."
     destroyed: "Activiteit verwijderd."
+    mass_import_short: "Activiteiten importeren"
     mass_import: "Meerdere activiteiten aanmaken in %{group}"
     mass_imported: "%{count} activiteiten aangemaakt!"
 

db/seeds.rb

@@ -22,7 +22,8 @@ u = User.create!(
   email: 'maarten@maartenberg.nl',
   person: p,
   password: 'aardbei123',
-  password_confirmation: 'aardbei123'
+  password_confirmation: 'aardbei123',
+  confirmed: true
 )
 
 p2 = Person.create!(

public/batch_activities.csv

@@ -1,2 +1,2 @@
-name,description,location,start_date,start_time,end_date,end_time,deadline_date,deadline_time
-Name,Description,Location,2017-12-31,12:34:00,2017-12-31,12:43:00,2017-12-28,13:37:00
+name,description,location,start_date,start_time,end_date,end_time,deadline_date,deadline_time,reminder_at_date,reminder_at_time,subgroup_division_enabled,no_response_action
+Name,Description,Where,2017-12-31,12:34,2017-12-31,12:43,2017-12-28,13:37,2017-12-27,23:59,Y(es)/N(o),P(resent)/A(bsent)