odon
/
free-pmo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Update project job creation froms 

Move job creation form  views to projects/jobs
Add select2 js for project selection on add job from other
project feature
pull/12/head
Nafies Luthfi 8 years ago
parent
d88170735e
commit
aa63b01831
3 changed files with 48 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      app/Http/Controllers/Projects/JobsController.php
  2. 54
      resources/views/projects/jobs/add-from-other-project.blade.php
  3. 19
      resources/views/projects/jobs/create.blade.php

6
app/Http/Controllers/Projects/JobsController.php
View File

@ -33,7 +33,7 @@ class JobsController extends Controller
{
$workers = $this->repo->getWorkersList();
return view('jobs.create', compact('project', 'workers'));
return view('projects.jobs.create', compact('project', 'workers'));
}
public function addFromOtherProject(Request $request, Project $project)
@ -43,10 +43,10 @@ class JobsController extends Controller
$projects = $this->repo->getProjectsList();
if ($request->has('project_id')) {
$selectedProject = $this->repo->requireProjectById($request->get('project_id'));
$selectedProject = Project::find($request->get('project_id'));
}
return view('jobs.add-from-other-project', compact('project', 'workers', 'projects', 'selectedProject'));
return view('projects.jobs.add-from-other-project', compact('project', 'workers', 'projects', 'selectedProject'));
}
public function store(CreateRequest $req, $projectId)

54
resources/views/jobs/add-from-other-project.blade.php → resources/views/projects/jobs/add-from-other-project.blade.php
View File

@ -1,27 +1,25 @@
@extends('layouts.app')
@extends('layouts.project')
@section('title', __('job.add_from_other_project').' | '.$project->name)
@section('subtitle', __('job.create'))
@section('content')
@include('projects.partials.breadcrumb',['title' => __('job.add_from_other_project')])
@section('action-buttons')
@can('create', new App\Entities\Projects\Job)
{!! html_link_to_route('projects.jobs.create', trans('job.create'), [$project->id], ['class' => 'btn btn-success','icon' => 'plus']) !!}
{!! html_link_to_route('projects.jobs.add-from-other-project', trans('job.add_from_other_project'), [$project->id], ['class' => 'btn btn-default','icon' => 'plus']) !!}
@endcan
@endsection
@section('content-project')
<div class="row">
<div class="col-sm-6">
<div class="col-sm-6 col-sm-offset-2">
<div class="panel panel-default">
<div class="panel-heading"><h3 class="panel-title">{{ __('job.add_from_other_project') }}</h3></div>
<div class="panel-body">
{!! Form::open(['method' => 'get']) !!}
<div class="form-group">
<label for="project_id" class="text-primary">{{ __('project.project') }}</label>
<div class="input-group">
{!! Form::select('project_id', $projects, request('project_id'), [
'class' => 'form-control customer-select',
'placeholder' => '-- '.__('project.select').' --'
]) !!}
<span class="input-group-btn"><button class="btn btn-default btn-sm" type="submit">{{ __('project.show_jobs') }}</button></span>
</div>
</div>
{!! Form::close() !!}
{{ Form::open(['method' => 'get', 'class' => 'form-inline', 'style' => 'margin-bottom:20px']) }}
{!! FormField::select('project_id', $projects, ['label' => false, 'placeholder' => __('project.select')]) !!}
{{ Form::submit(__('project.show_jobs'), ['class' => 'btn btn-default btn-sm']) }}
{{ Form::close() }}
@if ($selectedProject)
{!! Form::open(['route' => ['projects.jobs.store-from-other-project', $project->id]]) !!}
<ul class="list-unstyled">
@ -56,8 +54,24 @@
</div>
</div>
</div>
<div class="col-sm-6">
@include('projects.partials.project-show')
</div>
</div>
@endsection
@section('ext_css')
{!! Html::style(url('assets/css/plugins/select2.min.css')) !!}
<style>
.select2-selection.select2-selection--single {
border-radius: 0;
height: 30px;
}
</style>
@endsection
@section('script')
{!! Html::script(url('assets/js/plugins/select2.min.js')) !!}
<script>
(function() {
$('select[name=project_id]').select2();
})();
</script>
@endsection

19
resources/views/jobs/create.blade.php → resources/views/projects/jobs/create.blade.php
View File

@ -1,12 +1,18 @@
@extends('layouts.app')
@extends('layouts.project')
@section('title', __('job.create'))
@section('subtitle', __('job.create'))
@section('content')
@include('projects.partials.breadcrumb', ['title' => __('job.create')])
@section('action-buttons')
@can('create', new App\Entities\Projects\Job)
{!! html_link_to_route('projects.jobs.create', trans('job.create'), [$project->id], ['class' => 'btn btn-success','icon' => 'plus']) !!}
{!! html_link_to_route('projects.jobs.add-from-other-project', trans('job.add_from_other_project'), [$project->id], ['class' => 'btn btn-default','icon' => 'plus']) !!}
@endcan
@endsection
@section('content-project')
<div class="row">
<div class="col-sm-6">
<div class="col-sm-6 col-sm-offset-2">
{!! Form::open(['route' => ['projects.jobs.store', $project->id]]) !!}
<div class="panel panel-default">
<div class="panel-heading"><h3 class="panel-title">{{ __('job.create') }}</h3></div>
@ -41,9 +47,6 @@
</div>
{!! Form::close() !!}
</div>
<div class="col-sm-6">
@include('projects.partials.project-show')
</div>
</div>
@endsection
Write Preview
Loading…
Cancel
Save