Commit 0d4113c5 authored by gxx's avatar gxx

团队中的项目添加

parent 2fe195f2
......@@ -13,7 +13,7 @@ interface ProjectServiceContract
{
public function add($name ,$creator_id ,$owner_id ,$group_id ,$brief ,$cover_img);
public function delete($project_id);
public function update($project_id,$name ,$creator_id ,$owner_id ,$group_id ,$brief ,$cover_img);
public function update($id,$name ,$creator_id ,$owner_id ,$group_id ,$brief ,$cover_img);
public function get($project_id);
public function getAll();
......@@ -23,4 +23,9 @@ interface ProjectServiceContract
public function updateTask($id,$name,$project_id,$creator_id,$owner_id,$status,$brief,$starts_at,$ends_at);
public function getTask($id);
public function getAllTask();
public function simpleSearch($id,$content,$item);
}
\ No newline at end of file
......@@ -18,4 +18,7 @@ interface UserServiceContract
public function update($id,$phone,$user_name,$real_name,$gender,$email,$head_icon);
public function simpleSearch($search_content,$page);
public function search($content);
}
\ No newline at end of file
......@@ -21,7 +21,7 @@ class GroupController extends Controller
public function getAll()
{
$groups= $this->mGroup->getAll(2);
$groups= $this->mGroup->getAll(8);
if (count($groups) > 0){
return view('admin/group/grouptables',compact('groups'));
}
......@@ -35,8 +35,10 @@ class GroupController extends Controller
$id = $request->id;
$groups = $this->mGroup->get($id);
if (count($groups) > 0){
return view('admin/group/groupinformation',compact('groups'));
}
return Message::makeError('查找失败');
}
......@@ -160,9 +162,9 @@ class GroupController extends Controller
public function simpleSearch(Request $request)
{
$search_content = $request->search;
$page = 1;
$page = 8;
$groups = $this->mGroup->simpleSearch($search_content,$page);
return view('admin/group/grouptables',compact('groups'));
return view('admin/group/grouplike',['groups'=>$groups,'params'=>$search_content]);
}
}
<?php
namespace App\Http\Controllers;
use App\Contracts\ProjectServiceContract;
use App\Models\Group;
use App\Util\Message;
use Illuminate\Http\Request;
class ProjectController extends Controller
{
public $mProject;
public function __construct(ProjectServiceContract $project)
{
$this->mProject = $project;
}
public function get(Request $request)
{
$projectid = $request->id;
$project = $this->mProject->get($projectid);
if (count($project) > 0){
return view('admin/project/projectinformation',compact('project'));
}
}
public function getAll(Request $request)
{
$groupid = $request->id;
$projects = Group::find($groupid)->project;
if (count($projects) > 0){
return view('admin/project/projecttables',compact('projects'));
}
return Message::makeError('无数据!');
}
public function updatePage(Request $request)
{
$projectid= $request->id;
$project = $this->mProject->get($projectid);
$result = $project;
if (count($project)>0){
return view('admin/project/update',compact('result'));
}
return Message::makeError('错误');
}
public function update(Request $request)
{
$id = $request->id;
$name = $request->name;
$cover_img = $request->cover_img;
$owner_id = $request->owner_id;
$creator_id = $request->creator_id;
$group_id = $request->group_id;
$brief = $request->brief;
$project = $this->mProject->update($id,$name ,$creator_id ,$owner_id ,$group_id ,$brief ,$cover_img);
if ($project){
return back();
}
}
public function search(Request $request)
{
$content = $request->search;
$item = 2; // 每页显示条数
$projects = $this->mProject->simpleSearch($content,$item);
if (count($projects) > 0){
return view('admin/project/projecliketables',compact('projects'));
}
return Message::makeError('错误');
}
}
......@@ -73,7 +73,7 @@ class UserController extends Controller
public function getAll()
{
$result = $this->mUser->getAll(2);
$result = $this->mUser->getAll(8);
if ($result){
return view('admin/usertables',compact('result'));
}else{
......@@ -102,7 +102,7 @@ class UserController extends Controller
return Message::makeError('没有参数');
}
$search_content = $request->search;
$page = 1;
$page = 8;
$result = $this->mUser->simpleSearch($search_content,$page);
return view('admin/user/userlike',['result'=>$result,'params'=>$search_content]);
......
......@@ -25,4 +25,9 @@ class Group extends Model
{
return $this->hasMany('App\Models\UserGroup','group_id');
}
public function project()
{
return $this->hasMany('App\Models\Project','creator_id');
}
}
......@@ -10,4 +10,9 @@ class Project extends Model
use SoftDeletes;
protected $dates = ['delete_at'];
public function group()
{
return $this->hasOne('App\Models\Group','id','creator_id');
}
}
......@@ -11,8 +11,10 @@ namespace App\Services;
use App\Contracts\ProjectServiceContract;
use App\Models\Group;
use App\Models\Project;
use App\Models\Task;
use App\Util\UploadPhoto;
class ProjectService implements ProjectServiceContract
{
......@@ -47,21 +49,32 @@ class ProjectService implements ProjectServiceContract
}
}
public function update($project_id, $name, $creator_id, $owner_id, $group_id, $brief, $cover_img)
public function update($id, $name, $creator_id, $owner_id, $group_id, $brief, $cover_img)
{
$project = Project::find($project_id);
$project = Project::find($id);
if ($project == null){
return false;
}
$project->owner_id = $owner_id;
$project->creator_id = $creator_id;
$project->name = $name;
$project->cover_img = $cover_img;
$project->brief = $brief;
$project->group_id = $group_id;
$result =$project->update();
if ($cover_img == null){
$project->owner_id = $owner_id;
$project->creator_id = $creator_id;
$project->name = $name;
$project->brief = $brief;
$project->group_id = $group_id;
$result =$project->update();
}else{
$upload = new UploadPhoto();
$imgPath = $upload->upload($cover_img);
$project->owner_id = $owner_id;
$project->creator_id = $creator_id;
$project->name = $name;
$project->cover_img = $imgPath;
$project->brief = $brief;
$project->group_id = $group_id;
$result =$project->update();
}
if ($result){
return true;
......@@ -73,6 +86,7 @@ class ProjectService implements ProjectServiceContract
public function get($project_id)
{
$project = Project::find($project_id);
if ($project == null){
return null;
}else{
......@@ -175,4 +189,12 @@ class ProjectService implements ProjectServiceContract
}
public function simpleSearch($id,$content, $item)
{
$project = Project::where('name','like','%'.$content.'%')
->paginate($item);
return $project;
}
}
\ No newline at end of file
......@@ -10,6 +10,7 @@ namespace App\Services;
use App\Contracts\UserServiceContract;
use App\Models\Project;
use App\Models\User;
use App\Util\FileUploader;
use App\Util\UploadPhoto;
......@@ -18,7 +19,7 @@ class UserService implements UserServiceContract
{
public function simpleSearch($search_content,$page)
public function simpleSearch($search_content, $page)
{
$users = User::where('user_name','like','%'.$search_content.'%')
->orWhere('phone','like','%'.$search_content.'%')
......@@ -83,4 +84,5 @@ class UserService implements UserServiceContract
return false;
}
}
}
\ No newline at end of file
......@@ -103,14 +103,11 @@
<div class="active tab-pane" id="activity" style="overflow: hidden">
@foreach($groups->usergroup as $user)
<div style="float: left;margin-left: 50px;">
<img class="profile-user-img img-responsive img-circle" src="{{url('storage/1.jpg')}}" alt="User profile picture" style="height: 110px;">
<div style="float: left;margin-left: 50px;">
<img class="profile-user-img img-responsive img-circle" src="{{url('storage/1.jpg')}}" alt="User profile picture" style="height: 110px;">
<h3 class="profile-username text-center">{{$user->users[0]['user_name']}}</h3>
</div>
</div>
@endforeach
......
@extends('admin/dashboard')
@section('content')
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
团队列表
</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"></h3>--}}
</div>
<!-- /.box-header -->
<div class="box-body">
<form action="{{url('group/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>logo</th>
<th>状态</th>
<th>操作</th>
</tr>
</thead>
</thead>
@if($groups == null)
<tbody>
<tr>
<td colspan="8" style="text-align: center;color: red"> 数据暂无 </td>
</tr>
</tbody>
</table>
@else
@foreach($groups as $group)
<tbody>
<tr>
<td>{{$group->id}}</td>
<td>{{$group->name}}</td>
<td>{{$group->brief}}</td>
<td><img src="{{asset($group->logo ==''?'暂无':$group->logo)}}" alt="" width="50px" height="40px"> </td>
<td>{{$group->status}}</td>
<td>
<a href="{{route('group.get',['id' => $group->id])}}" class="btn btn-info" > 查看详情 </a>
<a href="{{route('group.updatePage',['id' => $group->id])}}" class="btn btn-info"> 编辑 </a>
<a href="{{route('group.transferPage',['id'=>$group->id])}}" class="btn bg-orange"> 转让 </a>
<a href="{{route('project.getAll',['id'=>$group->id])}}" class="btn btn-info"> 查看团队项目 </a>
</td>
</tr>
</tbody>
@endforeach
</table>
{{ $groups->appends(['search' => $params])->links() }}
</div>
<!-- /.box-body -->
</div>
<!-- /.box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</section>
@endif
@endsection
\ No newline at end of file
......@@ -46,8 +46,7 @@
<thead>
<tr>
<th>ID</th>
<th>创建人</th>
<th>拥有人</th>
<th>团队名</th>
<th>简介</th>
<th>logo</th>
......@@ -67,22 +66,24 @@
<tbody>
<tr>
<td>{{$group->id}}</td>
<td><a href="{{route('user.get',$group->owner_id)}}">{{$group->creator->user_name}}</a></td>
<td>{{$group->owner->user_name}} </td>
<td>{{$group->name}}</td>
<td>{{$group->brief}}</td>
<td>{{$group->logo ==''?'暂无':$group->logo}}</td>
<td><img src="{{asset($group->logo ==''?'暂无':$group->logo)}}" alt="" width="50px" height="40px"> </td>
<td>{{$group->status}}</td>
<td>
<a href="{{route('group.get',['id' => $group->id])}}" class="btn btn-info" > 查看详情 </a>
<a href="{{route('group.updatePage',['id' => $group->id])}}" class="btn btn-info"> 编辑 </a>
<a href="{{route('group.transferPage',['id'=>$group->id])}}" class="btn bg-orange"> 转让 </a>
<a href="{{route('project.getAll',['id'=>$group->id])}}" class="btn btn-info"> 查看团队项目 </a>
</td>
</tr>
</tbody>
@endforeach
</table>
{{ $groups->links() }}
{{--{{ $result->appends(['search' => $params])->links() }}--}}
</div>
<!-- /.box-body -->
</div>
......
@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('group/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>简介</th>
<th>logo</th>
<th>状态</th>
<th>操作</th>
</tr>
</thead>
@if($groups == null)
<tbody>
<tr>
<td colspan="8" style="text-align: center;color: red"> 数据暂无 </td>
</tr>
</tbody>
</table>
@else
@foreach($groups as $group)
<tbody>
<tr>
<td>{{$group->id}}</td>
<td><a href="{{route('user.get',$group->owner_id)}}">{{$group->creator->user_name}}</a></td>
<td>{{$group->owner->user_name}} </td>
<td>{{$group->name}}</td>
<td>{{$group->brief}}</td>
<td>{{$group->logo ==''?'暂无':$group->logo}}</td>
<td>{{$group->status}}</td>
<td>
<a href="{{route('group.get',['id' => $group->id])}}" class="btn btn-info" > 查看详情 </a>
<a href="{{route('group.updatePage',['id' => $group->id])}}" class="btn btn-info"> 编辑 </a>
<a href="{{route('group.transferPage',['id'=>$group->id])}}" class="btn bg-orange"> 转让 </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
@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>{{$project['id']}}</td>
<td>{{$project['name']}}</td>
<td>{{$project->group['name']}}</td>
<td>{{$project['brief']}}</td>
<td><img src="{{$project['cover_img']==''?url('storage/1.jpg'):asset($project['cover_img'])}}" alt="" width="50px" height="40px"> </td>
<td>
<a href="{{route('project.get',['id'=>$project['id']])}}" class="btn btn-info" > 查看详情 </a>
<a href="{{route('project.updatePage',['id'=>$project['id']])}}" 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
@extends('admin/dashboard')
@section('content')
<section class="content-header">
<h1>
项目详细信息
</h1>
<ol class="breadcrumb">
<li><a href="#"><i class="fa fa-dashboard"></i> Home</a></li>
<li><a href="#">Examples</a></li>
<li class="active">User profile</li>
</ol>
</section>
<!-- Main content -->
<section class="content">
<div class="row">
<div class="col-md-3">
<!-- Profile Image -->
<div class="box box-primary">
<div class="box-body box-profile">
<img class="profile-user-img img-responsive img-circle" src="{{asset($project['cover_img']==''?url('storage/1.jpg'):$project['cover_img'])}}" alt="User profile picture">
<h3 class="profile-username text-center">项目logo</h3>
<ul class="list-group list-group-unbordered">
<li class="list-group-item">
<b>项目名称</b> <a class="pull-right">{{$project['name']}}</a>
</li>
<li class="list-group-item">
<b>简介</b> <a class="pull-right">{{$project['brief']==''?'暂无':$project['brief']}}</a>
</li>
<li class="list-group-item">
<b>创建者</b> <a class="pull-right">{{$project->group['name']}}</a>
</li>
</ul>
<a href="#" class="btn btn-primary btn-block"><b>关注</b></a>
</div>
<!-- /.box-body -->
</div>
<!-- /.box -->
<!-- About Me Box -->
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">About Me</h3>
</div>
<!-- /.box-header -->
<div class="box-body">
<strong><i class="fa fa-book margin-r-5"></i> Education</strong>
<p class="text-muted">
B.S. in Computer Science from the University of Tennessee at Knoxville
</p>
<hr>
<strong><i class="fa fa-map-marker margin-r-5"></i> Location</strong>
<p class="text-muted">Malibu, California</p>
<hr>
<strong><i class="fa fa-pencil margin-r-5"></i> Skills</strong>
<p>
<span class="label label-danger">UI Design</span>
<span class="label label-success">Coding</span>
<span class="label label-info">Javascript</span>
<span class="label label-warning">PHP</span>
<span class="label label-primary">Node.js</span>
</p>
<hr>
<strong><i class="fa fa-file-text-o margin-r-5"></i> Notes</strong>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam fermentum enim neque.</p>
</div>
<!-- /.box-body -->
</div>
<!-- /.box -->
</div>
<!-- /.col -->
<div class="col-md-9">
<div class="nav-tabs-custom">
<ul class="nav nav-tabs">
<li class="active"><a href="#activity" data-toggle="tab">Activity</a></li>
<li><a href="#timeline" data-toggle="tab">Timeline</a></li>
<li><a href="#settings" data-toggle="tab">Settings</a></li>
</ul>
<div class="tab-content">
<div class="active tab-pane" id="activity">
<!-- Post -->
<div class="post">
<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 -->
<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 -->
<div class="post">
<div class="user-block">
<img class="img-circle img-bordered-sm" src="../../dist/img/user6-128x128.jpg" alt="User Image">
<span class="username">
<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>
<!-- /.user-block -->
<div class="row margin-bottom">
<div class="col-sm-6">
<img class="img-responsive" src="../../dist/img/photo1.png" alt="Photo">
</div>
<!-- /.col -->
<div class="col-sm-6">
<div class="row">
<div class="col-sm-6">
<img class="img-responsive" src="../../dist/img/photo2.png" alt="Photo">
<br>
<img class="img-responsive" src="../../dist/img/photo3.jpg" alt="Photo">
</div>
<!-- /.col -->
<div class="col-sm-6">
<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>
<!-- /.post -->
</div>
<!-- /.tab-pane -->
<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">
<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>
</div>
</li>
<!-- END timeline item -->
<!-- timeline item -->
<li>
<i class="fa fa-comments bg-yellow"></i>
<div class="timeline-item">
<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!
Switzerland is small and neutral!
We are more like Germany, ambitious and misunderstood!
</div>
<div class="timeline-footer">
<a class="btn btn-warning btn-flat btn-xs">View comment</a>
</div>
</div>
</li>
<!-- END timeline item -->
<!-- timeline time label -->
<li class="time-label">
<span class="bg-green">
3 Jan. 2014
</span>
</li>
<!-- /.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>
</li>
<!-- END timeline item -->
<li>
<i class="fa fa-clock-o bg-gray"></i>
</li>
</ul>
</div>
<!-- /.tab-pane -->
<div class="tab-pane" id="settings">
<form class="form-horizontal">
<div class="form-group">
<label for="inputName" class="col-sm-2 control-label">Name</label>
<div class="col-sm-10">
<input type="email" class="form-control" id="inputName" placeholder="Name">
</div>
</div>
<div class="form-group">
<label for="inputEmail" class="col-sm-2 control-label">Email</label>
<div class="col-sm-10">
<input type="email" class="form-control" id="inputEmail" placeholder="Email">
</div>
</div>
<div class="form-group">
<label for="inputName" class="col-sm-2 control-label">Name</label>
<div class="col-sm-10">
<input type="text" class="form-control" id="inputName" placeholder="Name">
</div>
</div>
<div class="form-group">
<label for="inputExperience" class="col-sm-2 control-label">Experience</label>
<div class="col-sm-10">
<textarea class="form-control" id="inputExperience" placeholder="Experience"></textarea>
</div>
</div>
<div class="form-group">
<label for="inputSkills" class="col-sm-2 control-label">Skills</label>
<div class="col-sm-10">
<input type="text" class="form-control" id="inputSkills" placeholder="Skills">
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<div class="checkbox">
<label>
<input type="checkbox"> I agree to the <a href="#">terms and conditions</a>
</label>
</div>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-danger">Submit</button>
</div>
</div>
</form>
</div>
<!-- /.tab-pane -->
</div>
<!-- /.tab-content -->
</div>
<!-- /.nav-tabs-custom -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</section>
@endsection
\ No newline at end of file
@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>{{$project['id']}}</td>
<td>{{$project['name']}}</td>
<td>{{$project->group['name']}}</td>
<td>{{$project['brief']}}</td>
<td><img src="{{$project['cover_img']==''?url('storage/1.jpg'):asset($project['cover_img'])}}" alt="" width="50px" height="40px"> </td>
<td>
<a href="{{route('project.get',['id'=>$project['id']])}}" class="btn btn-info" > 查看详情 </a>
<a href="{{route('project.updatePage',['id'=>$project['id']])}}" 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
@extends('admin/dashboard')
@section('content')
<!-- general form elements -->
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">项目信息编辑</h3>
</div>
<!-- /.box-header -->
<!-- form start -->
<form role="form" action="{{route('project.update')}}" method="post" enctype="multipart/form-data">
{{csrf_field()}}
<div class="box-body">
<div class="form-group">
<label for="exampleInputFile">项目Logo</label>
<p>
<img src="{{asset($result['cover_img']==''?url('storage/1.jpg'):$result['cover_img'])}}" alt="" width="100px" height="80px" style="border-radius: 80%">
</p>
</div>
<div class="form-group">
<label for="exampleInputEmail1">项目名称</label>
<input type="text" class="form-control" id="exampleInputEmail1" placeholder="User_email" name="name" value="{{$result['name']}}">
<input type="hidden" name="id" value="{{$result['id']}}">
<input type="hidden" name="group_id" value="{{$result->group['id']}}">
</div>
<div class="form-group">
<label for="exampleInputEmail1">项目创建者</label>
<input type="text" class="form-control" id="exampleInputEmail1" placeholder="User_email" value="{{$result->group['name']}}" readonly>
<input type="hidden" name="creator_id" value="{{$result['creator_id']}}">
</div>
<div class="form-group">
<label for="exampleInputEmail1">项目拥有者</label>
<input type="text" class="form-control" id="exampleInputEmail1" placeholder="User_email" value="{{$result->group['name']}}" readonly>
<input type="hidden" name="owner_id" value="{{$result['owner_id']}}">
</div>
<div class="form-group">
<label for="exampleInputPassword1">简介</label>
<input type="text" class="form-control" id="exampleInputPassword1" placeholder="Real_name" name="brief" value="{{$result['brief']}}">
</div>
<div class="form-group">
<label for="exampleInputFile">更换头像</label>
<input type="file" id="exampleInputFile" name="cover_img" >
</div>
</div>
<!-- /.box-body -->
<div class="box-footer">
<button type="submit" class="btn btn-primary">保存</button>
</div>
</form>
</div>
<script src="{{url('js/jquery-3.2.1.min.js')}}"> </script>
{{--<script>--}}
{{--$("#exampleInputFile").change(function(){--}}
{{--var file = this.files[0];--}}
{{--// 判断文件大小--}}
{{--if(file.size > 5*1024*1024){--}}
{{--alert('文件过大!');--}}
{{--}--}}
{{--// 使用FileReader 接口--}}
{{--var reader = new FileReader();--}}
{{--// 成功读取--}}
{{--reader.onload = function(){--}}
{{--// 通过reader.result 属性 来访问生成的 base 64 DataURL--}}
{{--var fileInfo = reader.result;--}}
{{--$('#Preview').attr('src',fileInfo).css({width:100,height:90});--}}
{{--//console.log(fileInfo);--}}
{{--var name = $('#exampleInputFile').val();--}}
{{--// 分割字符串--}}
{{--var arr = name.split('\\');--}}
{{--var fileName = arr[arr.length-1];--}}
{{--base64_uploading(fileInfo,fileName);--}}
{{--}--}}
{{--reader.readAsDataURL(file);--}}
{{--})--}}
{{--//AJAX 上传base 64--}}
{{--function base64_uploading(base64Data,fileName){--}}
{{--$.ajax({--}}
{{--type: 'post',--}}
{{--url: "{{url('user/update')}}",--}}
{{--data: {--}}
{{--'base64':base64Data,--}}
{{--'name':fileName--}}
{{--},--}}
{{--dataType:"json",--}}
{{--headers: {--}}
{{--'X-CSRF-TOKEN': $('meta[name="_token"]').attr('content')--}}
{{--},--}}
{{--success:function(data){--}}
{{--console.log(data);--}}
{{--if (data ==1 ){--}}
{{--alert('上传成功')--}}
{{--}else {--}}
{{--alert('上传失败')--}}
{{--}--}}
{{--},--}}
{{--error:function (data) {--}}
{{--alert(1);--}}
{{--console.log(data);--}}
{{--}--}}
{{--})--}}
{{--}--}}
{{--</script>--}}
@endsection
\ No newline at end of file
......@@ -64,18 +64,45 @@
</li>
<li class="treeview">
<a href="#"><i class="fa fa-link"></i> <span>系统设置</span>
<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="{{url('sms')}}">短信通知余额</a></li>
</ul>
</a>
<ul class="treeview-menu">
<li><a href="">项目列表</a></li>
{{--<li><a href="#">Link in level 2</a></li>--}}
</ul>
</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>
<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="{{url('sms')}}">短信通知余额</a></li>
</ul>
</li>
</li>
</ul>
<!-- /.sidebar-menu -->
</section>
......
......@@ -70,6 +70,15 @@ Route::group(['prefix'=> 'group'],function (){
Route::get('search','GroupController@simpleSearch')->name('group.search');
});
// 项目
Route::group(['prefix'=> 'project'],function (){
Route::get('getAll','ProjectController@getAll')->name('project.getAll');
Route::get('get','ProjectController@get')->name('project.get');
Route::get('updatePage','ProjectController@updatePage')->name('project.updatePage');
Route::post('update','ProjectController@update')->name('project.update');
Route::get('search','ProjectController@search')->name('project.search');
});
......
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