From b27c40eae2ba3220fda3855e1d5b223cb7cb608d Mon Sep 17 00:00:00 2001
From: Patrick Peng Sun <patrick@lawipac.com>
Date: Sun, 16 Jul 2017 17:09:46 +1000
Subject: [PATCH] err -> flash.

---
 crmMeeting.go        | 24 +++++++++++++++++-------
 spa/assets/js/spa.js |  9 ++-------
 spa/edit.html        |  2 --
 spa/editmeeting.html | 12 ++++++++++--
 spa/pinegrow.json    |  2 +-
 spaEditMeeting.go    | 14 ++++++++------
 6 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/crmMeeting.go b/crmMeeting.go
index 8015d7b..bddfccc 100644
--- a/crmMeeting.go
+++ b/crmMeeting.go
@@ -46,7 +46,8 @@ type crmdMeeting struct {
 	CoverName string `json:"coverName,omitempty"`
 
 	//for web spa operation
-	spaErrMsg []string
+	spaFlashTitle string
+	spaFlashMsg   []string
 }
 
 func (m crmdMeeting) save() (newMeeting crmdMeeting, err error) {
@@ -75,20 +76,29 @@ func (m crmdMeeting) save() (newMeeting crmdMeeting, err error) {
 }
 
 func (m *crmdMeeting) clearSpaErr(e string) {
-	m.spaErrMsg = []string{}
+	m.spaFlashMsg = []string{}
 }
 
-func (m *crmdMeeting) addSpaErr(e string) {
-	m.spaErrMsg = append(m.spaErrMsg, e)
+func (m *crmdMeeting) addFlashMsg(e string) {
+	m.spaFlashMsg = append(m.spaFlashMsg, e)
 }
 
-func (m crmdMeeting) ErrorMessage() string {
-	v := strings.Join(m.spaErrMsg, "<br>")
+func (m crmdMeeting) FlashMessage() string {
+	v := strings.Join(m.spaFlashMsg, "<br>")
 	return v
 }
 
+func (m crmdMeeting) FlashTitle() string {
+	return m.spaFlashTitle
+}
+
+func (m *crmdMeeting) setFlashTitle(val string) string {
+	m.spaFlashTitle = val
+	return m.spaFlashTitle
+}
+
 func (m crmdMeeting) hasError() bool {
-	return len(m.spaErrMsg) > 0
+	return len(m.spaFlashMsg) > 0
 }
 
 func (m crmdMeeting) CoverCacheURL() string {
diff --git a/spa/assets/js/spa.js b/spa/assets/js/spa.js
index bfd5e8f..b387ef0 100644
--- a/spa/assets/js/spa.js
+++ b/spa/assets/js/spa.js
@@ -54,7 +54,7 @@ $(document).ready(function() {
         aftershow: function(){} //Function for after opening timepicker  
     });
     
-    if ($("#errmsg").text() !="" && $("#errmsg").text() != "{{.ErrorMessage}}"){
+    if ($("#errmsg").text() !="" && $("#errmsg").text() != "{{.FlashMessage}}"){
         $('#modalerr').modal('open');
     }
     
@@ -62,10 +62,5 @@ $(document).ready(function() {
     console.log("spa ready");
 });
 
-$("form").submit(function(event){
-    if ( $(this).find("input.Iagree").is(":checked") == false) {
-        alert("发起活动之前，请选择同意主办方须知");
-        event.preventDefault();
-    }
-});  
+
   
diff --git a/spa/edit.html b/spa/edit.html
index 934d811..a94e321 100644
--- a/spa/edit.html
+++ b/spa/edit.html
@@ -102,8 +102,6 @@
                     closeWechatBrowser();
                 }
             });
-            
-            
         </script>
     </body>
 </html>
diff --git a/spa/editmeeting.html b/spa/editmeeting.html
index acdf79c..e30e134 100644
--- a/spa/editmeeting.html
+++ b/spa/editmeeting.html
@@ -116,8 +116,8 @@
                     <!-- Modal Structure -->
                     <div id="modalerr" class="modal deep-orange">
                         <div class="modal-content">
-                            <h5>您好</h5>
-                            <p id="errmsg">{{.ErrorMessage}}</p>
+                            <h5>{{.FlashTitle}}</h5>
+                            <p id="errmsg">{{.FlashMessage}}</p>
                         </div>
                         <div class="modal-footer">
                             <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">知道了</a>
@@ -137,4 +137,12 @@
         <script src="materialize/js/materialize.js"></script>
         <script src="index.js"></script>
         <script src="assets/js/spa.js"></script>
+        <script type="text/javascript">
+            $("form").submit(function(event){
+    			if ( $(this).find("input.Iagree").is(":checked") == false) {
+        			alert("发起活动之前，请选择同意主办方须知");
+        			event.preventDefault();
+    			}
+			});  
+        </script>
     </body>
diff --git a/spa/pinegrow.json b/spa/pinegrow.json
index 1c54ada..3c66500 100644
--- a/spa/pinegrow.json
+++ b/spa/pinegrow.json
@@ -1 +1 @@
-{"files":{"edit.html":{"frameworks":["spa","pg.insight.events","pg.code-validator","pg.asset.manager","pg.project.items","mat0.97.5","pg.html","pg.components"],"last_page_width":896},"404.html":{"frameworks":["spa","pg.insight.events","pg.code-validator","pg.asset.manager","pg.project.items","mat0.97.5","pg.html","pg.components"],"last_page_width":1024},"livecast.html":{"frameworks":["spa","pg.insight.events","pg.code-validator","pg.project.items","pg.asset.manager","mat0.97.5","pg.html","pg.components"],"last_page_width":1024},"newEvents.html":{"frameworks":["spa","pg.insight.events","pg.code-validator","pg.project.items","pg.asset.manager","mat0.97.5","pg.html","pg.components"],"last_page_width":1024},"newevent.html":{"frameworks":["spa","pg.insight.events","pg.asset.manager","pg.code-validator","pg.project.items","mat0.97.5","pg.html","pg.components"],"last_page_width":1024},"editmeeting.html":{"frameworks":["spa","pg.insight.events","pg.asset.manager","pg.code-validator","pg.project.items","mat0.97.5","pg.html","pg.components"],"last_page_width":1024},"403.html":{"frameworks":["spa","pg.insight.events","pg.code-validator","pg.asset.manager","pg.project.items","mat0.97.5","pg.html","pg.components"],"last_page_width":1024},"400.html":{"frameworks":["spa","pg.insight.events","pg.code-validator","pg.asset.manager","pg.project.items","mat0.97.5","pg.html","pg.components"],"last_page_width":1024},"500.html":{"frameworks":["spa","pg.insight.events","pg.code-validator","pg.asset.manager","pg.project.items","mat0.97.5","pg.html","pg.components"],"last_page_width":1024}},"breakpoints":["28.875em","33.875em","35.875em","38.875em","40.125em","46.75em","360px","390px","420px","450px","480px","510px","540px","570px","601px","630px","660px","690px","720px","750px","780px","810px","840px","870px","900px","930px","960px","993px","1200px"],"frameworks":["spa","pg.insight.events","pg.asset.manager","pg.code-validator","pg.project.items","mat0.97.5","pg.html","pg.components"],"template_framework_id":"materialize"}
\ No newline at end of file
+{"files":{"edit.html":{"frameworks":["spa","pg.insight.events","pg.code-validator","pg.asset.manager","pg.project.items","mat0.97.5","pg.html","pg.components"],"last_page_width":896},"404.html":{"frameworks":["spa","pg.insight.events","pg.code-validator","pg.asset.manager","pg.project.items","mat0.97.5","pg.html","pg.components"],"last_page_width":1024},"livecast.html":{"frameworks":["spa","pg.insight.events","pg.code-validator","pg.project.items","pg.asset.manager","mat0.97.5","pg.html","pg.components"],"last_page_width":1024},"newEvents.html":{"frameworks":["spa","pg.insight.events","pg.code-validator","pg.project.items","pg.asset.manager","mat0.97.5","pg.html","pg.components"],"last_page_width":1024},"newevent.html":{"frameworks":["spa","pg.insight.events","pg.asset.manager","pg.code-validator","pg.project.items","mat0.97.5","pg.html","pg.components"],"last_page_width":1024},"editmeeting.html":{"frameworks":["spa","pg.insight.events","pg.asset.manager","pg.code-validator","pg.project.items","mat0.97.5","pg.html","pg.components"],"last_page_width":1024},"403.html":{"frameworks":["spa","pg.insight.events","pg.code-validator","pg.asset.manager","pg.project.items","mat0.97.5","pg.html","pg.components"],"last_page_width":1024},"400.html":{"frameworks":["spa","pg.insight.events","pg.code-validator","pg.asset.manager","pg.project.items","mat0.97.5","pg.html","pg.components"],"last_page_width":1024},"500.html":{"frameworks":["spa","pg.insight.events","pg.code-validator","pg.asset.manager","pg.project.items","mat0.97.5","pg.html","pg.components"],"last_page_width":1024}},"breakpoints":["28.875em","33.875em","35.875em","38.875em","40.125em","46.75em","360px","390px","420px","450px","480px","510px","540px","570px","601px","630px","660px","690px","720px","750px","780px","810px","840px","870px","900px","930px","960px","993px","1200px"],"frameworks":["spa","pg.insight.events","pg.code-validator","pg.asset.manager","pg.project.items","mat0.97.5","pg.html","pg.components"],"template_framework_id":"materialize"}
\ No newline at end of file
diff --git a/spaEditMeeting.go b/spaEditMeeting.go
index 9e7df9d..7b15c42 100644
--- a/spaEditMeeting.go
+++ b/spaEditMeeting.go
@@ -121,6 +121,8 @@ func (m crmdMeeting) saveFromWeb(w http.ResponseWriter, r *http.Request) {
 	meeting.ID = m.ID
 	updatedMeeting, err := meeting.save()
 	if err == nil {
+		updatedMeeting.setFlashTitle("成功保存")
+		updatedMeeting.addFlashMsg("活动信息已经成功保存，其他校友可通过公众号查阅本活动信息")
 		updatedMeeting.showEdit(w)
 		return
 	}
@@ -134,14 +136,14 @@ func (m *crmdMeeting) validateFormInput(form url.Values) bool {
 	if ok {
 		m.Name = val[0]
 	} else {
-		m.addSpaErr("活动主题/标题不能为空")
+		m.addFlashMsg("活动主题/标题不能为空")
 	}
 
 	val, ok = form["description"]
 	if ok {
 		m.Description = val[0]
 	} else {
-		m.addSpaErr("清添加描述活动本身")
+		m.addFlashMsg("清添加描述活动本身")
 	}
 
 	startdate, sok := form["startdate"]
@@ -150,14 +152,14 @@ func (m *crmdMeeting) validateFormInput(form url.Values) bool {
 	if sok && hok && rok {
 		m.buildStartDate(startdate[0], starthour[0], duration[0])
 	} else {
-		m.addSpaErr("活动日期，开始时间，持续时间 不能为空")
+		m.addFlashMsg("活动日期，开始时间，持续时间 不能为空")
 	}
 
 	val, ok = form["venue"]
 	if ok {
 		m.Venue = val[0]
 	} else {
-		m.addSpaErr("请添加活动地点/集合地点")
+		m.addFlashMsg("请添加活动地点/集合地点")
 	}
 
 	return !m.hasError()
@@ -187,7 +189,7 @@ func (m *crmdMeeting) buildStartDate(date, hour, duration string) {
 	value := strings.TrimSpace(date) + " " + strings.TrimSpace(hour) + " AEST" //Force Sydney time
 	t, err := time.Parse(layout, value)
 	if err != nil {
-		m.addSpaErr("开始日期，时间，无法识别")
+		m.addFlashMsg("开始日期，时间，无法识别")
 		return
 	}
 	utc, err := time.LoadLocation("UTC")
@@ -204,7 +206,7 @@ func (m *crmdMeeting) buildDuration(duration string) {
 	var hour, minute int
 	cnt, err := fmt.Sscanf(duration, "%d:%d", &hour, &minute)
 	if cnt != 2 && err != nil {
-		m.addSpaErr("持续时间不正确")
+		m.addFlashMsg("持续时间不正确")
 		return
 	}
 	m.Duration = (hour * 3600) + (minute * 60)