Skip to content

W
workbiu-admin
Commit 05d76b0c authored by gxx's avatar gxx
Browse files
Options

用户信息 显示日程

parent 8c3ff34b
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 115 deletions
app/Http/Controllers/UserController.php
View file @ 05d76b0c
......@@ -87,9 +87,6 @@ class UserController extends Controller
public function get($id)
{
$result = $this->mUser->get($id);
if ($result){
return view('admin/userinformation',compact('result'));
}else{
......
app/Models/User.php
View file @ 05d76b0c
......@@ -33,4 +33,9 @@ class User extends Model
{
return $this->hasMany('App\Models\Task','owner_id','id');
}
public function schedule()
{
return $this->hasMany('App\Models\Schedule','creator_id','id');
}
}
resources/views/admin/group/groupinformation.blade.php
View file @ 05d76b0c
......@@ -109,7 +109,7 @@
@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;">
<img class="profile-user-img img-responsive img-circle" src=" {{asset($user->users[0]['head_icon']==''?url('storage/1.jpg'):$user->users[0]['head_icon'])}}" alt="User profile picture" style="height: 110px;">
<h3 class="profile-username text-center">{{$user->users[0]['user_name']}}</h3>
</div>
......
resources/views/admin/sidebar.blade.php
View file @ 05d76b0c
......@@ -78,6 +78,21 @@
<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">
......
resources/views/admin/userinformation.blade.php
View file @ 05d76b0c
......@@ -100,125 +100,40 @@
</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.
@if(count($result->schedule) ==0 )
<h3> 暂无日程 </h3>
@else
@foreach($result->schedule as $schedule)
<strong><i class="fa fa-book margin-r-5"></i> {{$schedule['title']}} </strong>
<p class="text-muted">
<p>{{$schedule['content']}}</p>
<span class="description" style="color: #C1C4C4"> 开始时间：{{$schedule['starts_at']}} </span>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span class="description" style="color: #C1C4C4"> 结束时间： {{$schedule['ends_at']}} </span>
</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 -->
<hr>
@endforeach
@endif
</div>
<!-- /.tab-pane -->
<div class="tab-pane" id="timeline">
@if(count($result->tasks) == 0)
<h3> 你还没任务呢~~ </h3>
<h3> 没任务呢~~ </h3>
@else
......
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