Merge branch 'master' into #355-2fa

# Conflicts:
#	Vagrantfile
#	composer.json
#	composer.lock
#	resources/views/layouts/navbar.blade.php
#	routes/console.php

Author: dpslwk

.gitignore

@@ -13,6 +13,7 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 .env
+.env.backup
 database/database.sqlite
 .phpunit.result.cache
 
@@ -32,4 +33,6 @@ Thumbs.db
 mixwatch.log
 /public/mix-manifest.json
 /storage/proxies
-/version
+/version
+/laravel-echo-server.json
+laravel-echo-server.lock

README.md

@@ -3,6 +3,12 @@ Version 2 of our Hackspace Management System
 
 [![Build Status](https://travis-ci.org/NottingHack/hms2.svg?branch=master)](https://travis-ci.org/NottingHack/hms2)
 
+## Cloning
+We use submodules, either clone them with this repo
+`git clone --recurse-submodules [email protected]:NottingHack/hms2.git`
+or after
+`git submodule update --init`
+
 ## Hosts File
 
 Most of the development environment is taken care of by vagrant, you just need to `vagrant up` to load it.
@@ -33,3 +39,11 @@ When re-provisioning the box (`vagrnat up`) you must make sure that the `.env` f
 
 If the `mailserver.mailbox` tables it empty you can do a datebase reset and reseed with `dev/reseed.sh`
 
+## Vagrant suspend notes
+
+When bringing up vagrant box after a suspend or halt some of the service my not start correctly due to the shared folder, run this script to restart them
+
+`dev/restartservices`
+
+## Serving 
+ngrok http https://hmsdev:443

Vagrantfile

@@ -11,7 +11,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "NottingHack/hms2"
-  config.vm.box_version = ">=1.3.0"
+  config.vm.box_version = ">=1.4.0"
   config.vm.hostname = "hmsdev.nottingtest.org.uk"
 
   config.vm.provider :virtualbox do |vb|
@@ -27,13 +27,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision :shell, path: "dev/vagrant-config/scripts/mix.sh", privileged: false
   config.vm.provision :shell, path: "dev/vagrant-config/scripts/labelprinter.sh"
   config.vm.provision :shell, path: "dev/vagrant-config/scripts/laravel-queue.sh"
+  config.vm.provision :shell, path: "dev/vagrant-config/scripts/echo.sh"
   config.vm.provision :shell, path: "dev/vagrant-config/scripts/finish.sh"
 
   config.vm.network "private_network", ip: "192.168.25.35"
 
   config.trigger.after :up, :resume, :reload do |trigger|
       trigger.info = "Restaring Nginx & PHP"
-      trigger.run_remote = {inline: "sudo systemctl restart nginx php7.2-fpm"}
+      trigger.run_remote = {inline: "sudo systemctl restart nginx php7.2-fpm laravel-echo-server"}
       trigger.run_remote = {inline: "php /vagrant/artisan horizon:terminate"}
   end
 

app/Charts/ElectricReadingsChart.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Charts;
+
+use ConsoleTVs\Charts\Classes\Highcharts\Chart;
+
+class ElectricReadingsChart extends Chart
+{
+    /**
+     * Initializes the chart.
+     *
+     * @param ElectricMeter[] $meters
+     * @param array $readings
+     *
+     * @return void
+     */
+    public function __construct($meters, $readings)
+    {
+        parent::__construct();
+
+        $this->height = 600;
+        $this->title('Electricity usage');
+        $this->label('kW Hours');
+
+        $this->options([
+            'chart' => [
+                'zoomType' => 'x',
+            ],
+            'subtitle' => [
+                'text' => 'kW hours since previous reading.',
+            ],
+            'tooltip' => [
+                'split' => true,
+                'valueSuffix' => ' kW Hours',
+            ],
+            'plotOptions' => [
+                'area' => [
+                    'stacking' => 'normal',
+                ],
+            ],
+        ]);
+
+        $readings = collect($readings);
+
+        $readingLabels = $readings->map(function ($reading) {
+            return $reading['date']->toDateString();
+        });
+        $this->labels($readingLabels);
+
+        $previousReading = null;
+
+        foreach ($meters as $meter) {
+            $previousReading = null;
+            $meterReadings = $readings->mapWithKeys(function ($reading) use ($meter, &$previousReading) {
+                if (! is_null($previousReading) && ! is_null($reading[$meter->getName()])) {
+                    $unitsUsed = $reading[$meter->getName()] - $previousReading;
+                } else {
+                    $unitsUsed = null;
+                }
+                $previousReading = $reading[$meter->getName()];
+
+                return [
+                    $reading['date']->toDateString() => $unitsUsed,
+                ];
+            });
+
+            $this->dataset($meter->getName(), 'area', $meterReadings->values());
+        }
+    }
+}

app/Charts/SnackspaceDebtChart.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Charts;
+
+use ConsoleTVs\Charts\Classes\Highcharts\Chart;
+
+class SnackspaceDebtChart extends Chart
+{
+    /**
+     * Initializes the chart.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->height = 800;
+        $this->title('Snackspace');
+        $this->label('£');
+
+        $this->options([
+            'chart' => [
+                'zoomType' => 'x',
+            ],
+            'subtitle' => [
+                'text' => 'For all time, click/pinch to zoom.',
+            ],
+            'tooltip' => [
+                'split' => true,
+                'valuePrefix' => '£',
+            ],
+        ]);
+    }
+}

app/Console/Commands/Banking/AuditCommand.php

@@ -4,6 +4,7 @@
 
 use Carbon\Carbon;
 use HMS\Tools\ToolManager;
+use Illuminate\Support\Str;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 
@@ -741,13 +742,13 @@ protected function migrateMemberTools()
         foreach ($tools as $tool) {
             $toolRoleIds[$tool->id] = [
                 'MAINTAINER'    => DB::table('roles')
-                                        ->where('name', 'LIKE', 'tools.' . camel_case($tool->name) . '.maintainer')
+                                        ->where('name', 'LIKE', 'tools.' . Str::camel($tool->name) . '.maintainer')
                                         ->value('id'),
                 'INDUCTOR'      => DB::table('roles')
-                                        ->where('name', 'LIKE', 'tools.' . camel_case($tool->name) . '.inductor')
+                                        ->where('name', 'LIKE', 'tools.' . Str::camel($tool->name) . '.inductor')
                                         ->value('id'),
                 'USER'          => DB::table('roles')
-                                        ->where('name', 'LIKE', 'tools.' . camel_case($tool->name) . '.user')
+                                        ->where('name', 'LIKE', 'tools.' . Str::camel($tool->name) . '.user')
                                         ->value('id'),
             ];
         }

app/Console/Commands/Database/MigrateInstrumentaionCommand.php

@@ -2,9 +2,13 @@
 
 namespace App\Console;
 
+use App\Jobs\EmailTeamReminderJob;
 use App\Jobs\Snackspace\LogDebtJob;
+use App\Jobs\Banking\MembershipAuditJob;
 use Illuminate\Console\Scheduling\Schedule;
 use App\Jobs\GateKeeper\ZoneOccupantResetJob;
+use App\Jobs\Membership\AuditYoungHackersJob;
+use App\Jobs\Snackspace\MemberDebtNotificationJob;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 class Kernel extends ConsoleKernel
@@ -30,11 +34,11 @@ protected function schedule(Schedule $schedule)
         $schedule->command('invites:purge')
                  ->daily();
 
-        $schedule->command('hms:members:audit')
+        $schedule->job(new MembershipAuditJob)
                  ->weekdays()
                  ->dailyAt('23:55');
 
-        $schedule->command('hms:members:youngHackerAudit')
+        $schedule->job(new AuditYoungHackersJob)
                 ->dailyAt('06:00');
 
         $schedule->command('auth:clear-resets')
@@ -44,6 +48,8 @@ protected function schedule(Schedule $schedule)
 
         $schedule->job(new LogDebtJob)->daily();
         $schedule->job(new ZoneOccupantResetJob)->twiceDaily();
+        $schedule->job(new MemberDebtNotificationJob)->monthlyOn(1, '7:00');
+        $schedule->job(new EmailTeamReminderJob)->weeklyOn(2, '7:27');
     }
 
     /**