File upload okay

Author: Baptiste Prunot

Diff for: app/Http/Controllers/ChallengeController.php

@@ -6,7 +6,7 @@
 use Auth;
 use View;
 use App\Models\Team;
-use DB;
+use DB; use Storage;
 use App\Models\Challenge;
 use App\Http\Requests\ChallengeRequest;
 
@@ -34,9 +34,22 @@ public function validationList() {
 	 * in order to validate a challenge
 	 */
 	public function submitToValidation(Request $request, int $challengeId, int $teamId) {
+
+		$this->validate($request, [
+			"proof" => "required"
+		]);
+
+		$file = fopen($request->file('proof')->getRealPath(), "r+");
+		$filename = uniqid().".".$request->file("proof")->guessExtension();
+		Storage::disk('validation-proofs')->put($filename, $file);
+		fclose($file);
+
+		
 		$team = Team::find($teamId);
 		$challenge = Challenge::find($challengeId);
-		$team->challenges()->save($challenge, ["submittedOn"=> new \DateTime("now")]);
+		$team->challenges()->save($challenge, ["submittedOn"=> new \DateTime("now"), "pic_url" => "proof/".$filename]);
+		
+
 		$request->flash("success", "La défis a bien été soumis à validation");
 		return redirect(route("challenges.list"));
 	}
@@ -80,7 +93,7 @@ public function add(ChallengeRequest $request) {
 	/**
 	 * Used by team leader to submit a challenge to be validated
 	 */
-	public function submitChallenge(int $idChallenge) {
+	public function submitChallengeForm(int $idChallenge) {
 		$challenge = DB::table('challenges')->where("id", "=", $idChallenge)->first();
 		return View::make("dashboard.challenges.submit", [
 			"challenge" => $challenge
@@ -94,13 +107,19 @@ public function deleteChallenge(int $idChallenge) {
 
 	public function showChallengesList() {
 		$challenges = DB::table("challenges")->get();
-		return View::make('dashboard.challenges.list', [
-			"challenges" => $challenges
-		]);
+		$team = Team::find(Auth()->user()->team_id);
+		return View::make('dashboard.challenges.list', compact("challenges", "team"));
 	}
 
 	public function showSentChallenges() {
 		$challenges = Team::find(Auth::user()->team_id)->challenges()->get();
 		return view("dashboard.challenges.challenges_sent", compact("challenges"));
 	}
+
+	public function accept(int $challengeId, int $teamId) {
+		$challenge = Team::find($teamId)->challenges()->where("id", "=", $challengeId)->first();
+		$challenge->teams()->updateExistingPivot($teamId, ["validated" => true]);
+		$challenge->save();
+		return redirect(route("challenges.validationsList"));
+	}
 }

Diff for: app/Http/Controllers/ValidationPic.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Storage;
+
+
+class ValidationPic extends Controller
+{
+
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($name)
+    {
+		$pic = Storage::disk("validation-proofs")->get($name);
+		return (new Response($pic, 200))
+			->header("content-type", "image/*")
+			->header("content-disposition", "inline")
+		;
+				
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}

Diff for: app/Models/Challenge.php

@@ -19,7 +19,7 @@ class Challenge extends Model {
 	 * All the teams that asked validation for this challenge
 	 */
 	public function teams() {
-		return $this->belongsToMany("App\Models\Team")->withPivot("submittedOn");
+		return $this->belongsToMany("App\Models\Team", "challenge_validations")->withPivot(["submittedOn", "validated", "pic_url"]);
 	}
 
 }

Diff for: app/Models/Team.php

@@ -22,10 +22,28 @@ class Team extends Model
 	 * All the challenges sent to validation by the team
 	 */
 	public function challenges() {
-		return $this->belongsToMany("App\Models\Challenge")->withPivot("submittedOn")->where("team_id", "=", $this->id);
+		return $this->belongsToMany("App\Models\Challenge", "challenge_validations")->withPivot(["submittedOn", "validated", "pic_url"])->where("team_id", "=", $this->id);
 	}
 
-	public function hasPendingValidation() :bool {
+	/**
+	 * Returns all the pending validation : all the challenges where
+	 * 'validated' attribute is null
+	 */
+	public function getPendingValidations()  {
+		return $this->challenges()->wherePivot("validated", null);
+	}
+
+	/**
+	 * Check if a challenge (given  by id) has already been validated
+	 */
+	public function hasAlreadyValidatedChallenge(int $challengeId) :bool{
+		return count($this->challenges()->where("id", "=", $challengeId)->wherePivot("validated", true)->get())>0?true:false;
+	}
+
+	/**
+	 * Returns true if there is pending validations, false otherwise
+	 */
+	public function hasPendingValidations() :bool {
 		return count($this->challenges()->get())>0?true:false;
 	}
 

Diff for: config/filesystems.php

@@ -54,6 +54,12 @@
             'visibility' => 'public',
         ],
 
+		"validation-proofs" => [
+			'driver' => 'local',
+			'root' => storage_path('app/validation-proofs'),
+			'visibility' => 'private'
+		],
+
         's3' => [
             'driver' => 's3',
             'key' => 'your-key',

Diff for: database/migrations/2018_07_23_193401_primary_key_challenge_team.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class PrimaryKeyChallengeTeam extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('challenge_team', function (Blueprint $table) {
+			$table->primary(["team_id", "challenge_id"]);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('challenge_team', function (Blueprint $table) {
+			$table->dropPrimary(["team_id", "challenge_id"]);
+        });
+    }
+}

Diff for: database/migrations/2018_07_24_150217_rename_challenge_team_add_column.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RenameChallengeTeamAddColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+		Schema::rename("challenge_team", "challenge_validations");
+		Schema::table('challenge_validations', function(Blueprint $table) {
+			$table->string("pic_url", 100);
+		});
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+		Schema::rename("challenge_validations", "challenge_team");
+		Schema::table('challenge_team', function(Blueprint $table) {
+			$table->dropColumn("pic_url");
+		});
+
+    }
+}

Diff for: public/.htaccess

@@ -18,16 +18,16 @@
 		</thead>
 		<tbody>
 			@foreach($challenges as $challenge)
-			<tr scope="row">
-				<td>{{ $challenge->name }}</td>
-				@if($challenge->pivot->validated == null )
-				<td>Le défis n'a pas encore été traité</td>
-			@elseif(!$challenge->pivot->validated)
-				<p>Le défis a été refusé</p>
-				@else
-					<p>Le défis a été validé !</p>
-				@endif
-			</tr>
+				<tr scope="row">
+					<td>{{ $challenge->name }}</td>
+					@if($challenge->pivot->validated == null )
+						<td>Le défis n'a pas encore été traité</td>
+					@elseif(!$challenge->pivot->validated)
+						<td>le défis a été refusé</td>
+					@else
+						<td>le défis a été accepté</td>
+					@endif
+				</tr>
 			@endforeach
 		</tbody>
 	</table>

Diff for: public/css/student_autocomplete.css

@@ -37,7 +37,8 @@
 					</form>
 					<div class="btn-group" role="group"> 
 						<a href={{ route("challenges.modifyForm", ["challengeId" => $challenge->id]) }}><button class="btn btn-primary">Modifier</button></a>
-					@if(Auth::user()->ce)
+						{{--I check wether the user is a team leader, and also if the team has already validated this challenge, in that case, the "valider un défis" button doesn't appear--}}
+						@if(Auth::user()->ce && !$team->hasAlreadyValidatedChallenge($challenge->id))
 						<a href={{ route("challenges.submitForm", ["id" => $challenge->id]) }}><button class="btn btn-primary">valider un défis</button></a>
 					@endif
 					</div>

Diff for: public/docs/autorisation.pdf

@@ -25,14 +25,14 @@
 				</thead>
 				<tbody>
 					@forelse($teams as $team)
-						@if($team->hasPendingValidation())
-							@foreach($team->challenges()->get() as $challenge)
+						@if($team->hasPendingValidations())
+							@foreach($team->getPendingValidations()->get() as $challenge)
 								<tr>
 									<td>{{ $team->name }}</td>
 									<td>{{ $challenge->name }}</td>
-									<td> RIEN POUR LE MOMENT </td>
+									<td> <img src="{{ $challenge->pivot->pic_url }}" class="img-fluid rounded" alt="Image de validation du défis"> </td>
 									<td>
-										<a href=""><button class="btn btn-primary">valider</button></a>
+										<form method="post" action={{ route("challenges.accept", ["challengeId" => $challenge->id, "teamId" => $team->id]) }}><input class="btn btn-primary" type="submit" value="Valider"></form>
 										<form action=""><input class="btn btn-danger" type="submit" value="Refuser"> </form>
 									</td>
 								</tr>

Diff for: public/docs/branches.pdf

@@ -17,10 +17,10 @@
 		<form action={{ route("challenge.submit",[
 			"challengeId" => $challenge->id,
 			"teamId" => Auth::user()->team_id,
-		])  }} method="post">
+		])  }} method="post" enctype="multipart/form-data">
 			<div class="form-group">
 				<label for="file">Preuve de la réussite</label>
-				<input id="file" class="form-control-file" type="file" accept="image/*">
+				<input id="file" name="proof" class="form-control-file" type="file" accept="image/*">
 			</div>
 			<input class="btn btn-primary form-control" type="submit" value="Envoyer">
 	</form>

Diff for: public/docs/cgv.pdf

@@ -663,6 +663,10 @@
 	 * Routes for challenges
 	 */
 Route::group(["prefix" => "challenges"], function() {
+
+	/**
+	 * Admin authorization
+	 */
 	Route::group(["middleware" => "authorize:admin"], function() {
 
 		Route::get("add", [
@@ -686,12 +690,19 @@
 
 		Route::post("{challengeId}/modify", "ChallengeController@modify")->name("challenges.modify");
 
+		Route::post("{challengeId}/team/{teamId}/validate", "ChallengeController@accept")->name("challenges.accept");
+		Route::resource("proof", "ValidationPic");
+
 	});
 
+	/**
+	 * Team leader authorization
+	 */
 	Route::group(["middleware" => "authorize:ce"], function() {
+
 		Route::get("{id}/submit", [
 			"as" => "challenges.submitForm",
-			"uses" => "ChallengeController@submitChallenge"
+			"uses" => "ChallengeController@submitChallengeForm"
 		]);
 
 		Route::post("team/{teamId}/challenge/{challengeId}/submit", "ChallengeController@submitToValidation")->name("challenge.submit");