Added new messages to log pages

#5 #4

Author: Chris Dickenson

app/Extend/Parser.php

@@ -32,17 +32,20 @@ class Parser
     private $format_dump;
     private $chunk_dump;
     // final array
-    public $log_data;
+    private $log_data;
     private $log_text;
     // useful data for saving the log
     private $user_weight;
     private $log_date;
     // formatted data
     private $log;
-	private $new_prs = [];
 	private $log_exercises = [];
 	private $log_items = [];
 	private $exercises = [];
+    // for flash messages
+	private $new_prs = [];
+	private $new_exercises = [];
+    private $warnings = [];
 
 	public function __construct($log_text, $log_date, $user_weight)
     {
@@ -403,6 +406,11 @@ public function formatLogData ($is_new)
             $prs = Exercise_record::exercisePrs($this->user->user_id, $this->log_date, $exercise_name);
 
 			$max_estimate_rm = Exercise_record::getlastest1rm($this->user->user_id, $exercise_name)->value('pr_1rm');
+            if (count($item['data']) == 0)
+            {
+                $this->warnings['blank_exercise'] = true;
+            }
+            // add set data to exercise
 			for ($j = 0, $count_j = count($item['data']); $j < $count_j; $j++)
 			{
 				$set = $item['data'][$j];
@@ -442,6 +450,7 @@ public function formatLogData ($is_new)
                     $this->exercises[$i]['time'] = $this->log_items[$i][$j]->is_time;
                     $this->exercises[$i]['endurance'] = $this->log_items[$i][$j]->is_endurance;
                     $this->exercises[$i]['distance'] = $this->log_items[$i][$j]->is_distance;
+                    $this->new_exercises[] = [$exercise_name, $this->exercises[$i]['time'], $this->exercises[$i]['endurance'], $this->exercises[$i]['distance']];
                 }
 				$this->log_items[$i][$j]->logitem_1rm = $this->generate_rm ($this->log_items[$i][$j]->logitem_abs_weight, $set['R']);
 				// get estimate 1rm
@@ -469,6 +478,16 @@ public function formatLogData ($is_new)
         {
             Session::flash('new_prs', $this->new_prs);
         }
+        //return your new exercises :)
+        if (count($this->new_exercises) > 0)
+        {
+            Session::flash('new_exercises', $this->new_exercises);
+        }
+        //return warnings
+        if (count($this->warnings) > 0)
+        {
+            Session::flash('warnings', $this->warnings);
+        }
 	}
 
 	private function insertLogItemWeightTime ($set, $i, $j)

resources/views/log/view.blade.php

@@ -61,16 +61,33 @@
 					@if ($type == 'W')
 						<p>You have set a new <strong>{{ $exercise }} {{ $rep }}RM</strong> of <strong>{{ $weight }}</strong> kg</p>
 					@elseif ($type == 'D')
-						<p>You have set a new <strong>{{ $exercise }} {{ $rep }}RM</strong> of <strong>{{ $weight/1000 }}</strong>km</p>
+						<p>You have set a new <strong>{{ $exercise }} {{ $rep }}RM</strong> of <strong>{{ Format::format_distance($weight) }}</strong></p>
 					@else
-						<p>You have set a new <strong>{{ $exercise }} {{ $rep }}RM</strong> of <strong>{{ $weight }}</strong>s</p>
+						<p>You have set a new <strong>{{ $exercise }} {{ $rep }}RM</strong> of <strong>{{ Format::format_time($weight) }}</strong></p>
 					@endif
 				@endforeach
 			@endforeach
 		@endforeach
 	@endforeach
 </div>
 @endif
+@if (Session::has('new_exercises'))
+<div class="alert alert-info">
+	@foreach (session('new_exercises') as $new_exercise)
+		<p>You have logged {{ $new_exercise[0] }} for the first time</p>
+		<p class="small">We have set it to be a {{ ($new_exercise[2]) ? 'endurance' : (($new_exercise[3]) ? 'distance' : (($new_exercise[1]) ? 'time' : 'weight')) }} exercise by default from now on</p>
+	@endforeach
+</div>
+@endif
+@if (Session::has('warnings'))
+<div class="alert alert-danger">
+	@foreach (session('warnings') as $warning => $bool)
+		@if ($warning == 'blank_exercise')
+			<p>One or more of the exercises you added did not have any workout data</p>
+		@endif
+	@endforeach
+</div>
+@endif
 <div class="container-fluid">
 	<div class="row">
 		<div class="col-md-3 col-md-push-9">