发布测试版 2.5.0

app/Gdoo/Project/Controllers/TaskController.php

@@ -128,7 +128,7 @@ class TaskController extends DefaultController
             }
 
             if ($gets['start_at'] == '') {
-                $gets['start_at'] = date('Y-m-d H:i:s');
+                $gets['start_at'] = time();
             }
 
             $attachment = $gets['attachment'];
@@ -152,7 +152,7 @@ class TaskController extends DefaultController
             if ($gets['is_item'] == '0') {
                 $task = Task::find($task->id);
                 $task->created_at = format_datetime($task->created_at);
-                $task->user_name = get_user($task->user_id, 'name', false);
+                $task->user_name  = get_user($task->user_id, 'name', false);
                 return $this->json($task, true);
             } else {
                 return $this->json('恭喜你，添加任务成功。', true);

app/Gdoo/Project/Controllers/WidgetController.php

@@ -29,17 +29,14 @@ class WidgetController extends DefaultController
         ->count();
         $rate = 0;
         if ($count2 > 0) {
-            $rate = $count / $count2 * 100;
+            $rate = ($count - $count2) / $count2 * 100;
+            $rate = number_format($rate, 2);
         }
         $res = [
             'count' => $count,
             'count2' => $count2,
             'rate' => $rate,
         ];
-        return $this->render([
-            'dates' => $config['dates'],
-            'info' => $config['info'],
-            'res' => $res,
-        ]);
+        return $this->json($res, true);
     }
 }

app/Gdoo/Project/config.php

@@ -9,6 +9,7 @@ return [
             'type' => 2,
             'url' => 'project/widget/info',
             'more_url' => 'project/project/index',
+            'params' => ['permission' => 'dept2', 'date' => 'month'],
         ],
     ],
     'badges' => [

app/Gdoo/Project/views/project/add.blade.php

@@ -13,7 +13,7 @@
             </tr>
 
             <tr>
-                <td align="right">项目权限</td>
+                <td align="right">项目权限  <a href="javascript:;" class="fa fa-question-circle hinted" title="公开：所有人可以访问，成员编辑。<br>私有：成员访问和编辑。"></a></td>
                 <td align="left">
                     <select class="form-control input-sm" name="permission">
                         <option value="1">私有</option>

app/Gdoo/Project/views/project/index.blade.php

@@ -12,7 +12,7 @@
                 <div class="thumbnail" style="{{$upload_url}}/{{$row->image}}">
                     <div class="caption">
                         <h4 class="m-t-none">
-                            <span class="pull-right text-muted text-xs hinted" title="项目拥有者">{{get_user($row->user_id, 'name', false)}} @if($row->permission)<span class="label label-info">私有</span> @else <span class="label label-success">公开</span> @endif</span>
+                        <span class="pull-right text-muted text-xs hinted" title="项目拥有者">{{get_user($row->user_id, 'name', false)}} @if($row->permission)<span class="label label-info">私有</span> @else <span class="label label-success">公开</span> @endif</span>
                             @if($row->tasks->count())
                                 <span class="text-base badge bg-danger">{{$row->tasks->count()}}</span>
                             @endif

app/Gdoo/Project/views/widget/info.blade.php

@@ -1,15 +0,0 @@
-<div class="panel panel-shadow info-skin1">
-    <div class="info-l hidden-xs" style="background-color:{{$info['color']}}">
-        <i class="fa fa-2x {{$info['icon']}}"></i>
-    </div>
-    <div class="info-c">
-        <div class="info-name">{{$info['name']}}</div>
-        <a href="javascript:;" data-toggle="addtab" data-url="{{$info['more_url']}}" data-id="{{str_replace(['/', '?', '='], ['_', '_', '_'], $info['more_url'])}}" data-name="{{$info['name']}}">
-            <div class="text-info info-item" data-id="{{$info['id']}}" data-more_url="{{$info['more_url']}}">{{$res['count']}}</div>
-        </a>
-    </div>
-    <div class="info-r">
-        <div>比{{$dates[$info['params']['date']]}}</div>
-        <div class="rate @if($res['rate'] > 100) red @endif">{{$res['rate']}}%</div>
-    </div>
-</div>