FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major refactoring for PIREP statuses and states to accomodate ACARS/route data

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-12-19 20:19:36 -06:00
parent ac4958a2be
commit 0375bb420f
38 changed files with 352 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/views/admin/pireps/pirep_card.blade.php
View File

@@ -10,9 +10,9 @@
</a>
</h5>
<div>
@if($pirep->status == config('enums.pirep_status.PENDING'))
@if($pirep->state == PirepState::PENDING)
<div class="badge badge-warning">Pending</div>
@elseif($pirep->status === config('enums.pirep_status.ACCEPTED'))
@elseif($pirep->state === PirepState::ACCEPTED)
<div class="badge badge-success">Accepted</div>
@else
<div class="badge badge-danger">Rejected</div>
@@ -58,13 +58,13 @@
<table class="pull-right">
<tr>
<td>
@if($pirep->status == config('enums.pirep_status.PENDING')
|| $pirep->status == config('enums.pirep_status.REJECTED'))
@if($pirep->state == PirepState::PENDING
|| $pirep->state == PirepState::REJECTED)
{!! Form::open(['url' => '/admin/pireps/'.$pirep->id.'/status', 'method' => 'post',
'name' => 'accept_'.$pirep->id,
'id' => $pirep->id.'_accept',
'pirep_id' => $pirep->id,
'new_status' => config('enums.pirep_status.ACCEPTED'),
'new_status' => PirepState::ACCEPTED,
'class' => 'pirep_submit_status']) !!}
{!! Form::button('Accept', ['type' => 'submit', 'class' => 'btn btn-info']) !!}
{!! Form::close() !!}
@@ -72,13 +72,13 @@
</td>
<td>&nbsp;</td>
<td>
@if($pirep->status == config('enums.pirep_status.PENDING')
|| $pirep->status == config('enums.pirep_status.ACCEPTED'))
@if($pirep->state == PirepState::PENDING
|| $pirep->state == PirepState::ACCEPTED)
{!! Form::open(['url' => '/admin/pireps/'.$pirep->id.'/status', 'method' => 'post',
'name' => 'reject_'.$pirep->id,
'id' => $pirep->id.'_reject',
'pirep_id' => $pirep->id,
'new_status' => config('enums.pirep_status.REJECTED'),
'new_status' => PirepState::REJECTED,
'class' => 'pirep_submit_status']) !!}
{!! Form::button('Reject', ['type' => 'submit', 'class' => 'btn btn-danger']) !!}
{!! Form::close() !!}

2
resources/views/layouts/default/auth/login.blade.php
View File

@@ -1,5 +1,5 @@
@extends('layouts.default.auth.layout')
@section('title', 'log in')
@section('content')
<div class="col-md-4 content-center">
<div class="card card-login card-plain">

82
resources/views/layouts/default/auth/oldregister.blade.php
View File

@@ -1,82 +0,0 @@
@extends('layouts.default.app')
@section('content')
<div class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">Register</div>
<div class="panel-body">
<form class="form-horizontal" role="form" method="POST" action="{{ url('/register') }}">
{{ csrf_field() }}
<div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
<label for="name" class="col-md-4 control-label">Name</label>
<div class="col-md-6">
<input id="name" type="text" class="form-control" name="name" value="{{ old('name') }}" required autofocus>
@if ($errors->has('name'))
<span class="help-block">
<strong>{{ $errors->first('name') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
<label for="email" class="col-md-4 control-label">E-Mail Address</label>
<div class="col-md-6">
<input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
@if ($errors->has('email'))
<span class="help-block">
<strong>{{ $errors->first('email') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
<label for="password" class="col-md-4 control-label">Password</label>
<div class="col-md-6">
<input id="password" type="password" class="form-control" name="password" required>
@if ($errors->has('password'))
<span class="help-block">
<strong>{{ $errors->first('password') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
<label for="password-confirm" class="col-md-4 control-label">Confirm Password</label>
<div class="col-md-6">
<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
@if ($errors->has('password_confirmation'))
<span class="help-block">
<strong>{{ $errors->first('password_confirmation') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-group">
<div class="col-md-6 col-md-offset-4">
<button type="submit" class="btn btn-primary">
Register
</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
@endsection

2
resources/views/layouts/default/auth/register.blade.php
View File

@@ -1,5 +1,5 @@
@extends('layouts.default.app')
@section('title', 'register')
@section('content')
<div class="row">
<div class="col-sm-4"></div>

3
resources/views/layouts/default/auth/registered.blade.php
View File

@@ -1,5 +1,6 @@
@extends('layouts.default.app')
@section('title', 'registration submitted')
@section('content')
<div class="container registered-page">
@@ -7,4 +8,4 @@
<p>Your application has been submitted. It requires staff member approval, once a staff member has reviewed your application, you will receive an email confirmation.</p>
</div>
@endsection
@endsection

1
resources/views/layouts/default/dashboard/index.blade.php
View File

@@ -1,5 +1,6 @@
@extends('layouts.default.app')
@section('title', 'dashboard')
@section('content')
<div class="row">
<div class="col-sm-8">

1
resources/views/layouts/default/flights/index.blade.php
View File

@@ -1,5 +1,6 @@
@extends('layouts.default.app')
@section('title', 'flights')
@section('content')
<div class="row">
@include('flash::message')

2
resources/views/layouts/default/pireps/create.blade.php
View File

@@ -1,5 +1,5 @@
@extends('layouts.default.app')
@section('title', 'file pirep')
@section('content')
<div class="row">
<div class="col-md-12">

2
resources/views/layouts/default/pireps/index.blade.php
View File

@@ -1,5 +1,5 @@
@extends('layouts.default.app')
@section('title', 'pireps')
@section('content')
<div class="row">
<div class="col-md-12">

6
resources/views/layouts/default/pireps/show.blade.php
View File

@@ -1,6 +1,6 @@
@extends('layouts.default.app')
@section('title', 'PIREP '.$pirep->getFlightId())
@section('title', 'PIREP '.$pirep->ident)
@section('content')
<div class="row">
<div class="col-md-12">
@@ -14,9 +14,9 @@
<tr>
<td>Status</td>
<td>
@if($pirep->status == config('enums.pirep_status.PENDING'))
@if($pirep->state == PirepState::PENDING)
<div class="badge badge-warning ">Pending</div>
@elseif($pirep->status === config('enums.pirep_status.ACCEPTED'))
@elseif($pirep->state === PirepState::ACCEPTED)
<div class="badge badge-success">Accepted</div>
@else
<div class="badge badge-danger">Rejected</div>

4
resources/views/layouts/default/pireps/table.blade.php
View File

@@ -14,9 +14,9 @@
</a>
</h5>
<div>
@if($pirep->status == config('enums.pirep_status.PENDING'))
@if($pirep->state == PirepState::PENDING)
<div class="badge badge-warning">Pending</div>
@elseif($pirep->status == config('enums.pirep_status.ACCEPTED'))
@elseif($pirep->state == PirepState::ACCEPTED)
<div class="badge badge-success">Accepted</div>
@else
<div class="badge badge-danger">Rejected</div>

2
resources/views/layouts/default/profile/index.blade.php
View File

@@ -1,5 +1,5 @@
@extends('layouts.default.app')
@section('title', 'profile')
@section('content')
<div class="container profile-page">
<div class="page-header page-header-small text-color-dark-beige">