Skip to content

W
workbiu-admin
Commit 66dbca2d authored by gxx's avatar gxx
Browse files
Options

任务

parent 0d4113c5
Hide whitespace changes
Inline Side-by-side
Showing with 232 additions and 215 deletions
app/Contracts/UserServiceContract.php
View file @ 66dbca2d
...@@ -19,6 +19,4 @@ interface UserServiceContract ...@@ -19,6 +19,4 @@ interface UserServiceContract
public function simpleSearch($search_content,$page); public function simpleSearch($search_content,$page);
public function search($content);
} }
\ No newline at end of file
app/Http/Controllers/AuthController.php 0 → 100644
View file @ 66dbca2d
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class AuthController extends Controller
{
public function getAll()
{
echo 123;
return view('admin/auth/authtables');
}
}
app/Http/Controllers/ProjectController.php
View file @ 66dbca2d
...@@ -21,6 +21,7 @@ class ProjectController extends Controller ...@@ -21,6 +21,7 @@ class ProjectController extends Controller
{ {
$projectid = $request->id; $projectid = $request->id;
$project = $this->mProject->get($projectid); $project = $this->mProject->get($projectid);
if (count($project) > 0){ if (count($project) > 0){
return view('admin/project/projectinformation',compact('project')); return view('admin/project/projectinformation',compact('project'));
} }
......
app/Http/Controllers/UserController.php
View file @ 66dbca2d
...@@ -87,6 +87,9 @@ class UserController extends Controller ...@@ -87,6 +87,9 @@ class UserController extends Controller
public function get($id) public function get($id)
{ {
$result = $this->mUser->get($id); $result = $this->mUser->get($id);
if ($result){ if ($result){
return view('admin/userinformation',compact('result')); return view('admin/userinformation',compact('result'));
}else{ }else{
......
app/Models/Project.php
View file @ 66dbca2d
...@@ -15,4 +15,10 @@ class Project extends Model ...@@ -15,4 +15,10 @@ class Project extends Model
{ {
return $this->hasOne('App\Models\Group','id','creator_id'); return $this->hasOne('App\Models\Group','id','creator_id');
} }
public function tasks()
{
return $this->hasMany('App\Models\Task','project_id','id');
}
} }
app/Models/Task.php
View file @ 66dbca2d
...@@ -10,4 +10,14 @@ class Task extends Model ...@@ -10,4 +10,14 @@ class Task extends Model
use SoftDeletes; use SoftDeletes;
protected $dates = ['delete_at']; protected $dates = ['delete_at'];
public function owner()
{
return $this->hasOne('App\Models\User','id','owner_id');
}
public function project()
{
return $this->hasOne('App\Models\Project','id','project_id');
}
} }
app/Models/User.php
View file @ 66dbca2d
...@@ -28,4 +28,9 @@ class User extends Model ...@@ -28,4 +28,9 @@ class User extends Model
{ {
return $this->hasOne('App\Models\EmailCheck'); return $this->hasOne('App\Models\EmailCheck');
} }
public function tasks()
{
return $this->hasMany('App\Models\Task','owner_id','id');
}
} }
app/Services/ProjectService.php
View file @ 66dbca2d
...@@ -87,6 +87,8 @@ class ProjectService implements ProjectServiceContract ...@@ -87,6 +87,8 @@ class ProjectService implements ProjectServiceContract
{ {
$project = Project::find($project_id); $project = Project::find($project_id);
if ($project == null){ if ($project == null){
return null; return null;
}else{ }else{
......
resources/views/admin/auth/authtables.blade.php 0 → 100644
View file @ 66dbca2d
@extends('admin/dashboard')
@section('content')
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
权限列表
{{--<small>advanced tables</small>--}}
</h1>
<ol class="breadcrumb">
<li><a href="#"><i class="fa fa-dashboard"></i> Home</a></li>
<li><a href="#">Tables</a></li>
<li class="active">Data tables</li>
</ol>
</section>
<!-- Main content -->
<section class="content">
<div class="row">
<div class="col-xs-12">
<div class="box">
<div class="box-header">
{{--<h3 class="box-title">Hover Data Table</h3>--}}
</div>
<!-- /.box-header -->
<div class="box-body">
{{--<form action="{{url('project/search')}}">--}}
{{--<div class="row">--}}
{{--<div class="col-lg-6">--}}
{{--<div class="input-group">--}}
{{--<input type="text" class="form-control" placeholder="项目名称" name="search">--}}
{{--<span class="input-group-btn">--}}
{{--<button class="btn btn-default" > 搜索 </button>--}}
{{--</span>--}}
{{--</div><!-- /input-group -->--}}
{{--</div><!-- /.col-lg-6 -->--}}
{{--</div><!-- /.row -->--}}
{{--</form>--}}
<br>
<table id="example2" class="table table-bordered table-hover">
<thead>
<tr>
<th>ID</th>
<th>权限名称</th>
<th>创建者</th>
<th>简介</th>
<th>cover_img</th>
<th>操作</th>
</tr>
</thead>
{{--@if($projects == null)--}}
{{--<tbody>--}}
{{--<tr>--}}
{{--<td colspan="8" style="text-align: center;color: red"> 数据暂无 </td>--}}
{{--</tr>--}}
{{--</tbody>--}}
{{--</table>--}}
{{--@else--}}
{{--@foreach($projects as $project)--}}
<tbody>
<tr>
<td>1</td>
<td>上天权限</td>
<td></td>
<td></td>
<td><img src="" alt="" width="50px" height="40px"> </td>
<td>
<a href="" class="btn btn-info" > 查看详情 </a>
<a href="" class="btn btn-info"> 编辑 </a>
</td>
</tr>
</tbody>
{{--@endforeach--}}
</table>
{{--{{ $groups->links() }}--}}
</div>
<!-- /.box-body -->
</div>
<!-- /.box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</section>
{{--@endif--}}
@endsection
\ No newline at end of file
resources/views/admin/project/projectinformation.blade.php
View file @ 66dbca2d
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<!-- About Me Box --> <!-- About Me Box -->
<div class="box box-primary"> <div class="box box-primary">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">About Me</h3> <h3 class="box-title">关于项目</h3>
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body">
...@@ -99,126 +99,51 @@ ...@@ -99,126 +99,51 @@
<div class="col-md-9"> <div class="col-md-9">
<div class="nav-tabs-custom"> <div class="nav-tabs-custom">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#activity" data-toggle="tab">Activity</a></li> <li class="active"><a href="#activity" data-toggle="tab">任务</a></li>
<li><a href="#timeline" data-toggle="tab">Timeline</a></li> <li><a href="#timeline" data-toggle="tab">Timeline</a></li>
<li><a href="#settings" data-toggle="tab">Settings</a></li> <li><a href="#settings" data-toggle="tab">Settings</a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
@foreach($project->tasks as $value)
<div class="active tab-pane" id="activity"> <div class="active tab-pane" id="activity">
<!-- Post --> <!-- Post -->
<div class="post"> <div class="post">
<div class="user-block"> <div class="user-block">
<img class="img-circle img-bordered-sm" src="../../dist/img/user1-128x128.jpg" alt="user image">
<span class="username">
<a href="#">Jonathan Burke Jr.</a>
<a href="#" class="pull-right btn-box-tool"><i class="fa fa-times"></i></a>
</span>
<span class="description">Shared publicly - 7:30 PM today</span>
</div>
<!-- /.user-block -->
<p>
Lorem ipsum represents a long-held tradition for designers,
typographers and the like. Some people hate it and argue for
its demise, but others ignore the hate as they create awesome
tools to help create filler text for everyone from bacon lovers
to Charlie Sheen fans.
</p>
<ul class="list-inline">
<li><a href="#" class="link-black text-sm"><i class="fa fa-share margin-r-5"></i> Share</a></li>
<li><a href="#" class="link-black text-sm"><i class="fa fa-thumbs-o-up margin-r-5"></i> Like</a>
</li>
<li class="pull-right">
<a href="#" class="link-black text-sm"><i class="fa fa-comments-o margin-r-5"></i> Comments
(5)</a></li>
</ul>
<input class="form-control input-sm" type="text" placeholder="Type a comment">
</div>
<!-- /.post -->
<!-- Post --> <a href="#">{{$value['name']}}</a>
<div class="post clearfix">
<div class="user-block">
<img class="img-circle img-bordered-sm" src="../../dist/img/user7-128x128.jpg" alt="User Image">
<span class="username">
<a href="#">Sarah Ross</a>
<a href="#" class="pull-right btn-box-tool"><i class="fa fa-times"></i></a>
</span>
<span class="description">Sent you a message - 3 days ago</span>
</div>
<!-- /.user-block -->
<p>
Lorem ipsum represents a long-held tradition for designers,
typographers and the like. Some people hate it and argue for
its demise, but others ignore the hate as they create awesome
tools to help create filler text for everyone from bacon lovers
to Charlie Sheen fans.
</p>
<form class="form-horizontal">
<div class="form-group margin-bottom-none">
<div class="col-sm-9">
<input class="form-control input-sm" placeholder="Response">
</div>
<div class="col-sm-3">
<button type="submit" class="btn btn-danger pull-right btn-block btn-sm">Send</button>
</div>
</div>
</form>
</div>
<!-- /.post -->
<!-- Post --> <span class="description"> 开始时间： {{$value['starts_at']}} </span>
<div class="post"> <span class="description"> 结束时间： {{$value['ends_at']}} </span>
<div class="user-block"> <span class="description"> 任务简介： {{$value['brief']}} </span>
<img class="img-circle img-bordered-sm" src="../../dist/img/user6-128x128.jpg" alt="User Image"> <span class="description"> 任务状态： {{$value['status']}} </span>
<span class="username"> <span class="description"> 负责人： &nbsp;&nbsp;&nbsp; {{$value->owner['user_name']}} </span>
<a href="#">Adam Jones</a>
<a href="#" class="pull-right btn-box-tool"><i class="fa fa-times"></i></a>
</span>
<span class="description">Posted 5 photos - 5 days ago</span>
</div> </div>
<!-- /.user-block --> <!-- /.user-block -->
<div class="row margin-bottom"> <p>
<div class="col-sm-6">
<img class="img-responsive" src="../../dist/img/photo1.png" alt="Photo"> </p>
</div> <ul class="list-inline">
<!-- /.col --> <li><a href="#" class="link-black text-sm"><i class="fa fa-share margin-r-5"></i> Share</a></li>
<div class="col-sm-6"> <li><a href="#" class="link-black text-sm"><i class="fa fa-thumbs-o-up margin-r-5"></i> Like</a>
<div class="row"> </li>
<div class="col-sm-6"> <li class="pull-right">
<img class="img-responsive" src="../../dist/img/photo2.png" alt="Photo"> <a href="#" class="link-black text-sm"><i class="fa fa-comments-o margin-r-5"></i> Comments
<br> (5)</a></li>
<img class="img-responsive" src="../../dist/img/photo3.jpg" alt="Photo"> </ul>
</div>
<!-- /.col --> <hr>
<div class="col-sm-6"> {{--<input class="form-control input-sm" type="text" placeholder="Type a comment">--}}
<img class="img-responsive" src="../../dist/img/photo4.jpg" alt="Photo">
<br>
<img class="img-responsive" src="../../dist/img/photo1.png" alt="Photo">
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
<ul class="list-inline">
<li><a href="#" class="link-black text-sm"><i class="fa fa-share margin-r-5"></i> Share</a></li>
<li><a href="#" class="link-black text-sm"><i class="fa fa-thumbs-o-up margin-r-5"></i> Like</a>
</li>
<li class="pull-right">
<a href="#" class="link-black text-sm"><i class="fa fa-comments-o margin-r-5"></i> Comments
(5)</a></li>
</ul>
<input class="form-control input-sm" type="text" placeholder="Type a comment">
</div> </div>
<!-- /.post --> <!-- /.post -->
</div> </div>
<!-- /.tab-pane --> @endforeach
<!-- /.tab-pane -->
<div class="tab-pane" id="timeline"> <div class="tab-pane" id="timeline">
<!-- The timeline --> <!-- The timeline -->
<ul class="timeline timeline-inverse"> <ul class="timeline timeline-inverse">
......
resources/views/admin/sidebar.blade.php
View file @ 66dbca2d
...@@ -63,32 +63,20 @@ ...@@ -63,32 +63,20 @@
</li> </li>
<li class="treeview">
<li class="treeview"> <a href="#"><i class="fa fa-link"></i> <span>权限管理</span>
<a href="#"><i class="fa fa-link"></i> <span>项目管理</span>
<span class="pull-right-container"> <span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</span> </span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="">项目列表</a></li> <li><a href="{{url('auth/getAll')}}">权限列表</a></li>
{{--<li><a href="#">Link in level 2</a></li>--}} {{--<li><a href="#">Link in level 2</a></li>--}}
</ul> </ul>
</li> </li>
<li class="treeview">
<a href="#"><i class="fa fa-link"></i> <span>日程管理</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href="">日程列表</a></li>
{{--<li><a href="#">Link in level 2</a></li>--}}
</ul>
</li>
......
resources/views/admin/userinformation.blade.php
View file @ 66dbca2d
...@@ -94,9 +94,9 @@ ...@@ -94,9 +94,9 @@
<div class="col-md-9"> <div class="col-md-9">
<div class="nav-tabs-custom"> <div class="nav-tabs-custom">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#activity" data-toggle="tab">Activity</a></li> <li class="active"><a href="#activity" data-toggle="tab">日程安排</a></li>
<li><a href="#timeline" data-toggle="tab">Timeline</a></li> <li><a href="#timeline" data-toggle="tab">任务</a></li>
<li><a href="#settings" data-toggle="tab">Settings</a></li> <li><a href="#settings" data-toggle="tab">待开发ing....</a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div class="active tab-pane" id="activity"> <div class="active tab-pane" id="activity">
...@@ -215,98 +215,57 @@ ...@@ -215,98 +215,57 @@
</div> </div>
<!-- /.tab-pane --> <!-- /.tab-pane -->
<div class="tab-pane" id="timeline"> <div class="tab-pane" id="timeline">
<!-- The timeline -->
<ul class="timeline timeline-inverse">
<!-- timeline time label -->
<li class="time-label">
<span class="bg-red">
10 Feb. 2014
</span>
</li>
<!-- /.timeline-label -->
<!-- timeline item -->
<li>
<i class="fa fa-envelope bg-blue"></i>
<div class="timeline-item">
<span class="time"><i class="fa fa-clock-o"></i> 12:05</span>
<h3 class="timeline-header"><a href="#">Support Team</a> sent you an email</h3>
<div class="timeline-body">
Etsy doostang zoodles disqus groupon greplin oooj voxy zoodles,
weebly ning heekya handango imeem plugg dopplr jibjab, movity
jajah plickers sifteo edmodo ifttt zimbra. Babblely odeo kaboodle
quora plaxo ideeli hulu weebly balihoo...
</div>
<div class="timeline-footer">
<a class="btn btn-primary btn-xs">Read more</a>
<a class="btn btn-danger btn-xs">Delete</a>
</div>
</div>
</li>
<!-- END timeline item -->
<!-- timeline item -->
<li>
<i class="fa fa-user bg-aqua"></i>
<div class="timeline-item"> @if(count($result->tasks) == 0)
<span class="time"><i class="fa fa-clock-o"></i> 5 mins ago</span>
<h3 class="timeline-header no-border"><a href="#">Sarah Young</a> accepted your friend request <h3> 你还没任务呢~~ </h3>
</h3>
</div>
</li>
<!-- END timeline item -->
<!-- timeline item -->
<li>
<i class="fa fa-comments bg-yellow"></i>
<div class="timeline-item"> @else
<span class="time"><i class="fa fa-clock-o"></i> 27 mins ago</span>
<h3 class="timeline-header"><a href="#">Jay White</a> commented on your post</h3>
<div class="timeline-body">
Take me to your leader! @foreach($result->tasks as $value)
Switzerland is small and neutral!
We are more like Germany, ambitious and misunderstood!
</div> <div class="active tab-pane" id="activity">
<div class="timeline-footer"> <!-- Post -->
<a class="btn btn-warning btn-flat btn-xs">View comment</a> <div class="post">
</div> <div class="user-block">
</div>
</li> <a href="#">{{$value['name']}}</a>
<!-- END timeline item --> <span class="description"> 所属项目： {{$value->project['name']}} </span>
<!-- timeline time label -->
<li class="time-label"> <span class="description"> 开始时间： {{$value['starts_at']}} </span>
<span class="bg-green"> <span class="description"> 结束时间： {{$value['ends_at']}} </span>
3 Jan. 2014 <span class="description"> 任务简介： {{$value['brief']}} </span>
</span> <span class="description"> 任务状态： {{$value['status']}} </span>
</li> <span class="description"> 负责人： &nbsp;&nbsp;&nbsp; {{$value->owner['user_name']}} </span>
<!-- /.timeline-label -->
<!-- timeline item -->
<li>
<i class="fa fa-camera bg-purple"></i>
<div class="timeline-item">
<span class="time"><i class="fa fa-clock-o"></i> 2 days ago</span>
<h3 class="timeline-header"><a href="#">Mina Lee</a> uploaded new photos</h3>
<div class="timeline-body">
<img src="http://placehold.it/150x100" alt="..." class="margin">
<img src="http://placehold.it/150x100" alt="..." class="margin">
<img src="http://placehold.it/150x100" alt="..." class="margin">
<img src="http://placehold.it/150x100" alt="..." class="margin">
</div> </div>
<!-- /.user-block -->
<p>
</p>
<ul class="list-inline">
<li><a href="#" class="link-black text-sm"><i class="fa fa-share margin-r-5"></i> Share</a></li>
<li><a href="#" class="link-black text-sm"><i class="fa fa-thumbs-o-up margin-r-5"></i> Like</a>
</li>
<li class="pull-right">
<a href="#" class="link-black text-sm"><i class="fa fa-comments-o margin-r-5"></i> Comments
(5)</a></li>
</ul>
<hr>
{{--<input class="form-control input-sm" type="text" placeholder="Type a comment">--}}
</div> </div>
</li> <!-- /.post -->
<!-- END timeline item -->
<li>
<i class="fa fa-clock-o bg-gray"></i>
</li> </div>
</ul> @endforeach
@endif
</div> </div>
<!-- /.tab-pane --> <!-- /.tab-pane -->
......
routes/web.php
View file @ 66dbca2d
...@@ -79,6 +79,11 @@ Route::group(['prefix'=> 'project'],function (){ ...@@ -79,6 +79,11 @@ Route::group(['prefix'=> 'project'],function (){
Route::get('search','ProjectController@search')->name('project.search'); Route::get('search','ProjectController@search')->name('project.search');
}); });
// 权限
Route::group(['prefix'=> 'auth'],function (){
Route::get('getAll','AuthController@getAll')->name('auth.getAll');
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment