Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Commit

Permalink
Add Fast and Slow Ring to Teams
Browse files Browse the repository at this point in the history
  • Loading branch information
@Studio384
Studio384 committed Apr 18, 2019
1 parent a86d73c commit 06cac79
Show file tree
Hide file tree
Showing 9 changed files with 62 additions and 10 deletions.
4 changes: 4 additions & 0 deletions app/Http/Controllers/MilestoneController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ public function store(Request $request) {
'iotTargeted' => request()->get('iotTargeted') === null ? 0 : 1,
'iotBroad' => request()->get('iotBroad') === null ? 0 : 1,
'teamTargeted' => request()->get('teamTargeted') === null ? 0 : 1,
'teamFast' => request()->get('teamFast') === null ? 0 : 1,
'teamSlow' => request()->get('teamSlow') === null ? 0 : 1,
'teamBroad' => request()->get('teamBroad') === null ? 0 : 1,
'holographicFast' => request()->get('holographicFast') === null ? 0 : 1,
'holographicSlow' => request()->get('holographicSlow') === null ? 0 : 1,
Expand Down Expand Up @@ -202,6 +204,8 @@ public function update(Request $request, $id) {
$milestone->iotSlow = request()->get('iotSlow') === null ? 0 : 1;
$milestone->iotTargeted = request()->get('iotTargeted') === null ? 0 : 1;
$milestone->iotBroad = request()->get('iotBroad') === null ? 0 : 1;
$milestone->teamFast = request()->get('teamFast') === null ? 0 : 1;
$milestone->teamSlow = request()->get('teamSlow') === null ? 0 : 1;
$milestone->teamTargeted = request()->get('teamTargeted') === null ? 0 : 1;
$milestone->teamBroad = request()->get('teamBroad') === null ? 0 : 1;
$milestone->holographicFast = request()->get('holographicFast') === null ? 0 : 1;
Expand Down
2 changes: 2 additions & 0 deletions app/Http/Controllers/RingsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public function index() {
$flights['holo']['broad'] = Release::holographic()->broad()->latestFlight()->first();
$flights['holo']['ltsc'] = Release::holographic()->ltsc()->latestFlight()->first();

$flights['team']['fast'] = Release::team()->active()->latestFlight()->first();
$flights['team']['slow'] = Release::team()->slow()->latestFlight()->first();
$flights['team']['targeted'] = Release::team()->targeted()->latestFlight()->first();
$flights['team']['broad'] = Release::team()->broad()->latestFlight()->first();

Expand Down
2 changes: 2 additions & 0 deletions app/Http/Controllers/TimelineController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ public function index(Request $request) {
$flights['holo']['broad'] = Release::holographic()->broad()->latestFlight()->first();
$flights['holo']['ltsc'] = Release::holographic()->ltsc()->latestFlight()->first();

$flights['team']['fast'] = Release::team()->active()->latestFlight()->first();
$flights['team']['slow'] = Release::team()->slow()->latestFlight()->first();
$flights['team']['targeted'] = Release::team()->targeted()->latestFlight()->first();
$flights['team']['broad'] = Release::team()->broad()->latestFlight()->first();

Expand Down
4 changes: 2 additions & 2 deletions app/Milestone.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ public function getFlights() {
),
'team' => array(
'skip' => -1,
'fast' => -1,
'slow' => -1,
'fast' => $this->teamFast,
'slow' => $this->teamSlow,
'preview' => -1,
'release' => -1,
'targeted' => $this->teamTargeted,
Expand Down
34 changes: 34 additions & 0 deletions database/migrations/2019_04_18_182511_add_team_fast_slow_rings.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

class AddTeamFastSlowRings extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('milestones', function (Blueprint $table) {
$table->integer('teamFast')->unsigned()->after('iotBroad');
$table->integer('teamSlow')->unsigned()->after('teamFast');
});
}

/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('milestones', function (Blueprint $table) {
$table->dropColumn('teamFast');
$table->dropColumn('teamSlow');
});
}
}
2 changes: 2 additions & 0 deletions resources/views/flights/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@
</div>
<div class="col-lg-4 col-md-6 col-sm">
<label for="ring" class="control-label">Team</label>
<div class="custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" id="f72" name="flight[7][2]" value="2"><label class="custom-control-label" for="f72"><span class="label fast">Fast Ring</span></label></label></div>
<div class="custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" id="f73" name="flight[7][3]" value="3"><label class="custom-control-label" for="f73"><span class="label slow">Slow Ring</span></label></label></div>
<div class="custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" id="f76" name="flight[7][6]" value="6"><label class="custom-control-label" for="f76"><span class="label targeted">Semi-Annual Targeted</span></label></label></div>
<div class="custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" id="f77" name="flight[7][7]" value="7"><label class="custom-control-label" for="f77"><span class="label broad">Semi-Annual Broad</span></label></label></div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions resources/views/milestones/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@
</div>
<div class="col-lg-4 col-md-6 col-sm">
<label for="ring" class="control-label">Team</label>
<div class="custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" id="teamFast" name="teamFast" {{ $milestone->teamFast == '1' ? 'checked' : '' }} value="2"><label class="custom-control-label" for="teamFast"><span class="label fast">Fast Ring</span></label></label></div>
<div class="custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" id="teamSlow" name="teamSlow" {{ $milestone->teamSlow == '1' ? 'checked' : '' }} value="7"><label class="custom-control-label" for="teamSlow"><span class="label slow">Slow Ring</span></label></label></div>
<div class="custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" id="teamTargeted" name="teamTargeted" {{ $milestone->teamTargeted == '1' ? 'checked' : '' }} value="6"><label class="custom-control-label" for="teamTargeted"><span class="label targeted">Semi-Annual Targeted</span></label></label></div>
<div class="custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" id="teamBroad" name="teamBroad" {{ $milestone->teamBroad == '1' ? 'checked' : '' }} value="7"><label class="custom-control-label" for="teamBroad"><span class="label broad">Semi-Annual Broad</span></label></label></div>
</div>
Expand Down
14 changes: 8 additions & 6 deletions resources/views/rings/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,26 +72,28 @@
<div class="col-md col-sm-6 col-12"><?php getTile( $flights['holo']['ltsc'] ) ?></div>
</div>
</div>
<div class="col-lg-4 col-md-8 col-sm-8 col-12" id="team">
<div class="col-12" id="team">
<p class="h3"><i class="fab fa-fw fa-windows"></i> Team</p>
<div class="row row-gutter">
<div class="col"><?php getTile( $flights['team']['targeted'] ) ?></div>
<div class="col"><?php getTile( $flights['team']['broad'] ) ?></div>
<div class="col-md col-6"><?php getTile( $flights['team']['fast'] ) ?></div>
<div class="col-md col-6"><?php getTile( $flights['team']['slow'] ) ?></div>
<div class="col-md col-6"><?php getTile( $flights['team']['targeted'] ) ?></div>
<div class="col-md col-6"><?php getTile( $flights['team']['broad'] ) ?></div>
</div>
</div>
<div class="col-lg-2 col-md-4 col-sm-4 col-6" id="sdk">
<div class="col-md-3 col-6" id="sdk">
<p class="h3"><i class="fab fa-fw fa-windows"></i> SDK</p>
<div class="row row-gutter">
<div class="col"><?php getTile( $flights['sdk']['targeted'] ) ?></div>
</div>
</div>
<div class="col-lg-2 col-md-4 col-sm-4 col-6" id="iso">
<div class="col-md-3 col-6" id="iso">
<p class="h3"><i class="fab fa-fw fa-windows"></i> ISO</p>
<div class="row row-gutter">
<div class="col"><?php getTile( $flights['iso']['targeted'] ) ?></div>
</div>
</div>
<div class="col-lg-4 col-md-8 col-sm-8 col-12" id="mobile">
<div class="col-md-6 col-12" id="mobile">
<p class="h3"><i class="fab fa-fw fa-windows"></i> Mobile</p>
<div class="row row-gutter">
<div class="col"><?php getTile( $flights['mobile']['targeted'] ) ?></div>
Expand Down
8 changes: 6 additions & 2 deletions resources/views/timeline.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,10 @@
</div>
<p class="h3"><i class="fab fa-fw fa-windows"></i> Team</p>
<div class="row row-gutter">
<div class="col"><?php getTile( $flights['team']['targeted'] ) ?></div>
<div class="col"><?php getTile( $flights['team']['broad'] ) ?></div>
<div class="col-6"><?php getTile( $flights['team']['fast'] ) ?></div>
<div class="col-6"><?php getTile( $flights['team']['slow'] ) ?></div>
<div class="col-6"><?php getTile( $flights['team']['targeted'] ) ?></div>
<div class="col-6"><?php getTile( $flights['team']['broad'] ) ?></div>
</div>
<p class="h3"><i class="fab fa-fw fa-windows"></i> Mobile</p>
<div class="row row-gutter">
Expand Down Expand Up @@ -267,6 +269,8 @@
</div>
<div class="col-lg-4 col-md-6 col-sm">
<label for="ring" class="control-label">Team</label>
<div class="custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" id="f72" name="flight[7][2]" value="2"><label class="custom-control-label" for="f72"><span class="label fast">Fast Ring</span></label></label></div>
<div class="custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" id="f73" name="flight[7][3]" value="3"><label class="custom-control-label" for="f73"><span class="label slow">Slow Ring</span></label></label></div>
<div class="custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" id="f76" name="flight[7][6]" value="6"><label class="custom-control-label" for="f76"><span class="label targeted">Semi-Annual Targeted</span></label></label></div>
<div class="custom-control custom-checkbox"><input type="checkbox" class="custom-control-input" id="f77" name="flight[7][7]" value="7"><label class="custom-control-label" for="f77"><span class="label broad">Semi-Annual Broad</span></label></label></div>
</div>
Expand Down

0 comments on commit 06cac79

Please sign in to comment.