Silent преди 6 години
родител
ревизия
b6f2d21844

+ 29 - 1
app/Http/Controllers/Teacher/StudentController.php

xqd xqd
@@ -41,7 +41,25 @@ class StudentController extends Controller
             $list = $list->where('name', 'like', $keyword);
         }
 
-        $list = $list->paginate()->withPath($this->getPaginateUrl());
+        $list = $list->get();
+
+        foreach($list as $item) {
+            $tmp = $item->getCourseInfo();
+            $item->course_name = $tmp['course_name'];
+            $item->apply_date = $tmp['apply_date'];
+            $item->end_date = $tmp['end_date'];
+            $item->teacher_names = $tmp['teacher_names'];
+        }
+
+        if($request->has('sort_field') && $request->has('sort_field_by')) {
+            if($request->input('sort_field_by') == 'asc') {
+                $list = $list->sortBy($request->input('sort_field'));
+            } else {
+                $list = $list->sortByDesc($request->input('sort_field'));
+            }
+        }
+
+        $list = $this->paginate($list);
 
         list($pre_uri, $model_name) = array($this->pre_uri, $this->model_name);
         return view($this->view_path . 'index', compact('list', 'pre_uri', 'model_name'));
@@ -92,6 +110,16 @@ class StudentController extends Controller
         return view($this->view_path . 'edit', compact('item','pre_uri', 'model_name', 'model'));
     }
 
+    public function detail(Request $request)
+    {
+        if(empty($request->input('id')) || empty($item = $this->model->find($request->input('id')))) {
+            return $this->showWarning('数据错误!');
+        }
+        list($pre_uri, $model_name, $model) = array($this->pre_uri, $this->model_name, $this->model);
+
+        return view($this->view_path . 'detail', compact('item','pre_uri', 'model_name', 'model'));
+    }
+
     public function update(Request $request)
     {
         if(!$request->isMethod('POST')) {

+ 1 - 1
resources/views/admin/students/create.blade.php

xqd
@@ -115,7 +115,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-sm-offset-1 control-label">备注</label>
                                 <div class="col-sm-8">
-                                    <input type="text" name="data[remark]" class="form-control" placeholder="请输入备注" value="{{ isset(old('data')['remark']) ? old('data')['remark'] : '' }}">
+                                    <textarea name="data[remark]" class="form-control">{{ isset(old('data')['remark']) ? old('data')['remark'] : '' }}</textarea>
                                 </div>
                                 @if($errors->has('remark'))
                                     <span class="help-block">{{ $errors->first('remark') }}</span>

+ 1 - 1
resources/views/admin/students/edit.blade.php

xqd
@@ -116,7 +116,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-sm-offset-1 control-label">备注</label>
                                 <div class="col-sm-8">
-                                    <input type="text" name="data[remark]" class="form-control" placeholder="请输入备注" value="{{ $item->remark }}">
+                                    <textarea name="data[remark]" class="form-control">{{ $item->remark }}</textarea>
                                 </div>
                                 @if($errors->has('remark'))
                                     <span class="help-block">{{ $errors->first('remark') }}</span>

+ 1 - 1
resources/views/teacher/students/create.blade.php

xqd
@@ -115,7 +115,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-sm-offset-1 control-label">备注</label>
                                 <div class="col-sm-8">
-                                    <input type="text" name="data[remark]" class="form-control" placeholder="请输入备注" value="{{ isset(old('data')['remark']) ? old('data')['remark'] : '' }}">
+                                    <textarea name="data[remark]" class="form-control">{{ isset(old('data')['remark']) ? old('data')['remark'] : '' }}</textarea>
                                 </div>
                                 @if($errors->has('remark'))
                                     <span class="help-block">{{ $errors->first('remark') }}</span>

+ 99 - 0
resources/views/teacher/students/detail.blade.php

xqd
@@ -0,0 +1,99 @@
+@extends('admin.layout')
+<style type="text/css">
+    .sg-label, .sg-value {
+        display: inline-block;
+        margin: 10px;
+        font-size: 1.5rem;
+    }
+    .sg-label {
+        text-align: right;
+        font-weight: bold;
+        width: 20%;
+    }
+    .sg-detail-container {
+        margin-left: 100px;
+    }
+</style>
+@section('header')
+
+@endsection
+
+@section('content')
+<div id="sg-main-container-sg">
+    <div class="wrapper wrapper-content animated fadeInRight">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="ibox float-e-margins">
+                    <div class="ibox-title">
+                        <h5>{{ $model_name . '详情' }}</h5>
+                        <div class="ibox-tools">
+                            <a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+                            </a>
+                        </div>
+                    </div>
+                    <div class="ibox-content">
+                        <div class="sg-detail-container">
+                            <div class="sg-item row">
+                                <div class="sg-label">姓名</div>
+                                <div class="sg-value">{{ $item->name }}</div>
+                            </div>
+                            <div class="sg-item row">
+                                <div class="sg-label">手机</div>
+                                <div class="sg-value">{{ $item->phone }}</div>
+                            </div>
+                            <div class="sg-item row">
+                                <div class="sg-label">绑定手机</div>
+                                <div class="sg-value">{{ $item->getBindPhone() }}</div>
+                            </div>
+                            <div class="sg-item row">
+                                <div class="sg-label">年龄</div>
+                                <div class="sg-value">{{ $item->age }}</div>
+                            </div>
+                            <div class="sg-item row">
+                                <div class="sg-label">婚姻状况</div>
+                                <div class="sg-value">{{ $item->getMarry() }}</div>
+                            </div>
+                            <div class="sg-item row">
+                                <div class="sg-label">职业</div>
+                                <div class="sg-value">{{ $item->job }}</div>
+                            </div>
+                            <div class="sg-item row">
+                                <div class="sg-label">工作地点</div>
+                                <div class="sg-value">{{ $item->work_addr }}</div>
+                            </div>
+                            <div class="sg-item row">
+                                <div class="sg-label">住址</div>
+                                <div class="sg-value">{{ $item->addr }}</div>
+                            </div>
+                            <div class="sg-item row">
+                                <div class="sg-label">指纹编号</div>
+                                <div class="sg-value">{{ $item->finger_number }}</div>
+                            </div>
+                            <div class="sg-item row">
+                                <div class="sg-label">备注</div>
+                                <div class="sg-value">{{ $item->remark }}</div>
+                            </div>
+                            <div class="sg-item row">
+                                <div class="sg-label">请假次数(短假)</div>
+                                <div class="sg-value">{{ $item->short_leave_times }}</div>
+                            </div>
+                            <div class="sg-item row">
+                                <div class="sg-label">请假次数(长假)</div>
+                                <div class="sg-value">{{ $item->long_leave_times }}</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+
+@section('footer')
+<script type="text/javascript">
+$(function () {
+
+})
+</script>
+@endsection

+ 1 - 1
resources/views/teacher/students/edit.blade.php

xqd
@@ -116,7 +116,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-sm-offset-1 control-label">备注</label>
                                 <div class="col-sm-8">
-                                    <input type="text" name="data[remark]" class="form-control" placeholder="请输入备注" value="{{ $item->remark }}">
+                                    <textarea name="data[remark]" class="form-control">{{ $item->remark }}</textarea>
                                 </div>
                                 @if($errors->has('remark'))
                                     <span class="help-block">{{ $errors->first('remark') }}</span>

+ 11 - 15
resources/views/teacher/students/index.blade.php

xqd xqd
@@ -39,14 +39,12 @@
                             <thead>
                                 <tr>
                                     <th>姓名</th>
-                                    <th>年龄</th>
-                                    <th>婚姻状况</th>
-                                    <th>职业</th>
-                                    <th>工作地点</th>
-                                    <th>住址</th>
-                                    <th>指纹编号</th>
+                                    <th>手机号</th>
+                                    <th class="sorting" data-sort="course_name">课程名称</th>
+                                    <th class="sorting" data-sort="apply_date">报名日期</th>
+                                    <th class="sorting" data-sort="end_date">截止日期</th>
+                                    <th class="sorting" data-sort="teacher_names">任课老师</th>
                                     <th>备注</th>
-                                    <th colspan="2">请假次数</th>
                                     <th>操作</th>
                                 </tr>
                             </thead>
@@ -59,18 +57,16 @@
                                     @foreach($list as $item)
                                         <tr>
                                             <td>{{ $item->name }}</td>
-                                            <td>{{ $item->age }}</td>
-                                            <td>{{ $item->getMarry() }}</td>
-                                            <td>{{ $item->job }}</td>
-                                            <td>{{ $item->work_addr }}</td>
-                                            <td>{{ $item->addr }}</td>
-                                            <td>{{ $item->finger_number }}</td>
+                                            <td>{{ $item->phone }}</td>
+                                            <td>{{ $item->course_name }}</td>
+                                            <td>{{ $item->apply_date }}</td>
+                                            <td>{{ $item->end_date }}</td>
+                                            <td>{{ $item->teacher_names }}</td>
                                             <td>{{ $item->remark }}</td>
-                                            <td>{{ empty($item->short_leave_times) ? 0 : $item->short_leave_times }}</td>
-                                            <td>{{ empty($item->long_leave_times) ? 0 : $item->long_leave_times }}</td>
                                             <td>
                                                 <div class="btn-group">
                                                     <a class="btn btn-sm btn-success btn-courses" href="{{ $pre_uri . 'Course/index?student_id=' . $item->id }}">课程</a>
+                                                    <a class="btn btn-sm btn-warning btn-detail" href="{{ $pre_uri . 'detail?id=' . $item->id }}">详情</a>
                                                     <a class="btn btn-sm btn-info btn-edit" href="{{ $pre_uri . 'edit?id=' . $item->id }}">编辑</a>
                                                     <div class="btn btn-sm btn-danger btn-delete" data-id="{{ $item->id }}">删除</div>
                                                 </div>