From 2bc68b845667f2bdab7b2172bbc0688b2def5fce Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Thu, 15 Mar 2018 17:41:16 +0800
Subject: [PATCH] fix~

---
 .../core/impls/AppActServiceImp.java          |  1 +
 src/main/ui/static/actapp/app_act_list.js     | 11 ++++-
 .../actapp/templates/act_app_detail.html      | 42 +++++++++++--------
 .../static/actapp/templates/act_app_list.html |  2 +-
 4 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java
index e3221c19a..5a78e66de 100644
--- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java
@@ -48,6 +48,7 @@ public class AppActServiceImp implements AppActService {
         Assert.notNull(act);
         JSONObject params = appActBean.toJsonParam();
         params.put("act_id",act_id);
+        params.put("update_time",new Date());
         actAppMapper.updateAct(params);
     }
 
diff --git a/src/main/ui/static/actapp/app_act_list.js b/src/main/ui/static/actapp/app_act_list.js
index 2876874e3..2ba083d6c 100644
--- a/src/main/ui/static/actapp/app_act_list.js
+++ b/src/main/ui/static/actapp/app_act_list.js
@@ -47,7 +47,16 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
         }]);
     app.controller('appActNewCtrl', ['$rootScope', '$scope', '$http', 'commonDialog','$state', function ($rootScope, $scope, $http, commonDialog,$state) {
         $scope.actDetail = {};
-        $scope.submit = function () {
+        $scope.submit = function (form) {
+            $scope.errmsg = null;
+            if (form.$invalid) {
+                angular.forEach(form, function (item, key) {
+                    if (key.indexOf('$') < 0) {
+                        item.$dirty = true;
+                    }
+                });
+                return;
+            }
             $http.put('/manager/app/act/new', $scope.actDetail).then(function (resp) {
                 commonDialog.alert({title: 'Success', content: '新增成功', type: 'success'});
                 $state.go('^.detail',{act_id:resp.data.act_id},{reload:true});
diff --git a/src/main/ui/static/actapp/templates/act_app_detail.html b/src/main/ui/static/actapp/templates/act_app_detail.html
index 265da8191..9ab3fa610 100644
--- a/src/main/ui/static/actapp/templates/act_app_detail.html
+++ b/src/main/ui/static/actapp/templates/act_app_detail.html
@@ -18,29 +18,37 @@
                         </div>
                         <div class="row">
                             <div class="col-xs-12">
-                                <div class="form-horizontal">
-                                    <div class="form-group">
+                                <form novalidate class="form-horizontal" name="appActForm">
+                                    <div class="form-group"
+                                         ng-class="{'has-error':appActForm.act_name.$invalid && appActForm.act_name.$dirty}">
                                         <label class="control-label col-xs-4 col-sm-2"
-                                               for="actDetail.act_name">Title</label>
+                                               for="actDetail.act_name">Title *</label>
                                         <div class="col-xs-8 col-sm-4">
-                                            <input type="text" class="form-control" id="actDetail.act_name"
-                                                   ng-model="actDetail.act_name">
+                                            <input type="text" class="form-control" id="actDetail.act_name" name="act_name"
+                                                   ng-model="actDetail.act_name" required>
+                                            <div ng-messages="appActForm.act_name.$error" ng-if="appActForm.act_name.$dirty">
+                                                <p class="small text-danger" ng-message="required">Title is required</p>
+                                            </div>
+                                            <div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>
                                         </div>
                                     </div>
-                                    <div class="form-group">
-                                        <label class="control-label col-xs-4 col-sm-2" for="actDetail.desc">ACT
-                                            Desc</label>
+                                    <div class="form-group"
+                                         ng-class="{'has-error':appActForm.desc.$invalid && appActForm.desc.$dirty}">
+                                        <label class="control-label col-xs-4 col-sm-2" for="actDetail.desc">ACT Desc *</label>
                                         <div class="col-xs-8 col-sm-4">
-                                            <input type="text" class="form-control" id="actDetail.desc"
-                                                   ng-model="actDetail.desc">
+                                            <textarea class="form-control" id="actDetail.desc" name="desc"
+                                                      ng-model="actDetail.desc" required></textarea>
+                                            <div ng-messages="appActForm.desc.$error" ng-if="appActForm.desc.$dirty">
+                                                <p class="small text-danger" ng-message="required">Desc is required</p>
+                                            </div>
                                         </div>
                                     </div>
                                     <div class="form-group">
                                         <label class="control-label col-xs-4 col-sm-2" for="actDetail.parms_json">Parms
                                             Json</label>
                                         <div class="col-xs-8 col-sm-4">
-                                            <input type="text" class="form-control" id="actDetail.parms_json"
-                                                   ng-model="actDetail.parms_json">
+                                            <textarea class="form-control" id="actDetail.parms_json"
+                                                      ng-model="actDetail.parms_json"></textarea>
                                         </div>
                                     </div>
                                     <div class="form-group">
@@ -72,11 +80,11 @@
                                         <div class="col-xs-8 col-sm-4">
                                             <label class="radio-inline">
                                                 <input type="radio" name="optionsRadiosinline" id="optionsRadios3" value="0" checked
-                                                       ng-model="actDetail.show_type"> Act Url
+                                                       ng-model="actDetail.show_type"> Url
                                             </label>
                                             <label class="radio-inline">
                                                 <input type="radio" name="optionsRadiosinline" id="optionsRadios4"  value="1"
-                                                       ng-model="actDetail.show_type"> Act Content
+                                                       ng-model="actDetail.show_type"> Content
                                             </label>
                                         </div>
                                     </div>
@@ -98,17 +106,17 @@
                                     </div>
                                     <div class="col-xs-12">
                                         <div class="btn-group">
-                                            <button class="btn btn-success" type="button" ng-click="submit()">
+                                            <button class="btn btn-success" type="button" ng-click="submit(appActForm)">
                                                 Submit
                                             </button>
                                         </div>
                                         <div class="btn-group">
-                                            <button class="btn btn-danger" type="button" ng-click="$dismiss()">
+                                            <button class="btn btn-danger" type="button"  ui-sref="appAct">
                                                 Cancel
                                             </button>
                                         </div>
                                     </div>
-                                </div>
+                                </form>
                             </div>
                         </div>
                     </div>
diff --git a/src/main/ui/static/actapp/templates/act_app_list.html b/src/main/ui/static/actapp/templates/act_app_list.html
index 080e79984..2c20099ed 100644
--- a/src/main/ui/static/actapp/templates/act_app_list.html
+++ b/src/main/ui/static/actapp/templates/act_app_list.html
@@ -20,7 +20,7 @@
                                     <button class="btn btn-success" type="button"  ui-sref=".new"><i class="fa fa-plus"></i> New ACT</button>
                                     <div class="checkbox">
                                         <label>
-                                            <input type="checkbox" ng-click="loadActAppList()" ng-model="params.is_valid">Published
+                                            <input type="checkbox" ng-click="loadActAppList(1)" ng-model="params.is_valid">Published
                                         </label>
                                     </div>
                                 </div>