From 2681003ca297c4c4bf48e23fe7679bb29c6c8e52 Mon Sep 17 00:00:00 2001
From: root <mr.truongld@gmail.com>
Date: Mon, 28 Nov 2016 07:36:23 +0000
Subject: [PATCH] update #1808, #1809

---
 app/index.html                          |  2 +-
 app/scripts/controllers/tshirtdesign.js | 25 +++++++++++++++++++++----
 app/scripts/services/favorite.js        | 25 +++++++++++++++++++++++++
 app/styles/main.css                     | 20 +++++++++++++++++---
 app/views/design_part/illustration.html |  4 ++--
 app/views/design_part/tshirt-saved.html | 19 ++++++++++---------
 6 files changed, 76 insertions(+), 19 deletions(-)

diff --git a/app/index.html b/app/index.html
index 28b5686..ee3082d 100644
--- a/app/index.html
+++ b/app/index.html
@@ -47,7 +47,7 @@
     <script src="bower_components/json3/lib/json3.min.js"></script>
     <![endif]-->
     <script type="text/javascript">
-        var VERSION = '27-11_04';
+        var VERSION = new Date().getTime();//'27-11_04';
         var require = {
           urlArgs: "ver="+VERSION,
         };
diff --git a/app/scripts/controllers/tshirtdesign.js b/app/scripts/controllers/tshirtdesign.js
index 510ebd3..f96b1a7 100644
--- a/app/scripts/controllers/tshirtdesign.js
+++ b/app/scripts/controllers/tshirtdesign.js
@@ -1,5 +1,6 @@
 define(['app'], function (app) {
 	app.controller('TshirtdesignCtrl', function ($scope, $rootScope, $window, $timeout, $illustration, $favorite) {
+		$scope.Math = window.Math;
 		$scope.savedFrameView = 'views/design_part/tshirt-saved.html?ver='+VERSION;
 		var canvas = new fabric.Canvas('main-design-container');
 		var diffX = 40, diffY = 40;
@@ -654,30 +655,46 @@ define(['app'], function (app) {
 			$('#content-saved-'+tab).addClass('active');
 			
 			$timeout(function(){
-				$('.saved-item').tooltip({
+				$('.saved-item img').tooltip({
 					animated: 'fade',
 					placement: 'bottom',
 					html: true
 				});
-			},1000);
+			},500);
 		}
 		
 		$favorite.loadFromRemote();
 		$scope.saveFavorite = function(){
+			if (!confirm('Do you want to put current design to your favorite?')){
+				return;
+			}
 			var dataDump = {
 				thumb: canvas.toDataURL('png'),
-				data: canvas.toJSON()
+				data: JSON.stringify(canvas)
 			}
 			$favorite.addToFavorite({
 				data: dataDump
 			})
-			console.log(dataDump);
+			// console.log(JSON.stringify(dataDump));
 			alert('saved');
 		}
 		
 		$scope.restoreSaved = function(item){
+			if (!confirm('this may be clear all current design frame, are you sure ?')){
+				return;
+			}
 			$('#tshirt-design-saved').modal('hide');
 			canvas.loadFromJSON(item.data,canvas.renderAll.bind(canvas));
 		}
+		
+		$scope.deleteFavorite = function(idx){
+			if (confirm('are you sure?')){
+				$favorite.removeFromFavorite({
+					idx: idx
+				});
+				$scope.recommendList = $favorite.getAll();
+				$scope.favoriteList = $favorite.getAll();
+			}
+		}
 	});
 });
diff --git a/app/scripts/services/favorite.js b/app/scripts/services/favorite.js
index 2988a44..2312282 100644
--- a/app/scripts/services/favorite.js
+++ b/app/scripts/services/favorite.js
@@ -59,6 +59,31 @@ define(['app'], function (app) {
                     httpObj.error(errorHandle);
                 }
             },
+            removeFromFavorite: function(params,successHandle,errorHandle) {
+                /*** load from localstorage for test */
+                DATA.splice(params.idx,1);
+                $window.localStorage.listFavorite = JSON.stringify(DATA);
+                return;
+                /*** end test */
+                
+                var httpObj = $http({
+                    url: $rootScope.API_URL+'/apiv1/favorite',
+                    method: 'POST',
+                    params: params || []
+                });
+                if (typeof successHandle == 'undefined'){
+                    successHandle = function(response){
+                        if (response.status==1){
+                            DATA = response.data;
+                        }
+                    }
+                }
+                httpObj.success(successHandle);
+                
+                if (typeof errorHandle != 'undefined'){
+                    httpObj.error(errorHandle);
+                }
+            },
             getAll: function(){
                 return DATA;
             }
diff --git a/app/styles/main.css b/app/styles/main.css
index f6a4fb4..c8bfb70 100644
--- a/app/styles/main.css
+++ b/app/styles/main.css
@@ -613,7 +613,7 @@ aside .step .finish-design button{
   cursor: pointer;
 }
 
-.footer-bar {
+.illustration-list .footer-bar, .saved-list .footer-bar {
     text-align: center;
     margin-top: 5px;
     bottom: 10px;
@@ -866,12 +866,13 @@ footer ul.nav-footer li a{
   width: 100%;
   border: #bbb solid 1px;
   background: #FFF;
-  margin-top: 5px;
+  margin-top: 0px;
   min-height: 400px;
-  padding-bottom: 20px;
+  padding: 10px;
 }
 
 #tshirt-design-saved .saved-list .saved-item{
+  width: 100px;
   height: 100px;
   overflow: hidden;
   float: left;
@@ -892,7 +893,20 @@ footer ul.nav-footer li a{
   width: 100px;
   cursor: pointer;
 }
+#tshirt-design-saved .saved-list .saved-item button {
+  background: #ff0f00;
+  color: #FFF;
+  border: 0;
+  position: absolute;
+  margin-left: -5px;
+  margin-top: -5px;
+  padding: 0 5px;
+}
+#tshirt-design-saved .saved-list .saved-item button:hover {
+  background: #ffcccc;
+}
 
 #tshirt-design-saved .saved-list .footer-bar {
   bottom: 20px;
+  width: 75%;
 }
\ No newline at end of file
diff --git a/app/views/design_part/illustration.html b/app/views/design_part/illustration.html
index 9e9ddb9..6bb425c 100644
--- a/app/views/design_part/illustration.html
+++ b/app/views/design_part/illustration.html
@@ -14,8 +14,8 @@
             <div class="clearfix"></div>
             <div class="footer-bar">
                 <div class="pull-left footer-pagination" ng-click="currentIllustrationPage=currentIllustrationPage-1" ng-show="currentIllustrationPage > 1">< Back</div>
-                {{currentIllustrationPage}}/{{currentIllustrationCate.list.length/perIllustrationPage | number:0}}
-                <div class="pull-right footer-pagination" ng-click="currentIllustrationPage=currentIllustrationPage+1" ng-show="currentIllustrationPage < (currentIllustrationCate.list.length/perIllustrationPage|number:0)">Next ></div>
+                {{currentIllustrationPage}}/{{Math.ceil(currentIllustrationCate.list.length/perIllustrationPage)}}
+                <div class="pull-right footer-pagination" ng-click="currentIllustrationPage=currentIllustrationPage+1" ng-show="currentIllustrationPage < Math.ceil(currentIllustrationCate.list.length/perIllustrationPage)">Next ></div>
             </div>
         </div>
     </div>
diff --git a/app/views/design_part/tshirt-saved.html b/app/views/design_part/tshirt-saved.html
index 3f3bee0..7da1e90 100644
--- a/app/views/design_part/tshirt-saved.html
+++ b/app/views/design_part/tshirt-saved.html
@@ -10,28 +10,29 @@
                 </ul>
                 <div class="tab-content">
                     <div role="tabpanel" class="tab-pane active" id="content-saved-favorite">
-                        <div class="saved-list" ng-init="currentFavoritePage=1;perFavoritePage=16">
-                            <div class="saved-item" ng-repeat="item in favoriteList | limitTo:perFavoritePage:((currentFavoritePage-1)*perFavoritePage) track by $index" ng-click="restoreSaved(item)" title="<img src='{{item.thumb}}' style='width:200px;background:#e2e2e2;margin:0;padding:0;margin-left:-8px;border:0'/>" data-toggle="tooltip">
-                                <img ng-src="{{item.thumb}}"/>
+                        <div class="saved-list" ng-init="currentFavoritePage=1;perFavoritePage=18">
+                            <div class="saved-item" ng-repeat="item in (favoriteList | limitTo:perFavoritePage:((currentFavoritePage-1)*perFavoritePage)) track by $index">
+                                <button ng-click="deleteFavorite($index)">X</button>
+                                <img ng-click="restoreSaved(item)" ng-src="{{item.thumb}}" title="<img src='{{item.thumb}}' style='width:200px;background:#e2e2e2;margin:0;padding:0;margin-left:-8px;border:0'/>" data-toggle="tooltip"/>
                             </div>
                             <div class="clearfix"></div>
                             <div class="footer-bar">
                                 <div class="pull-left footer-pagination" ng-click="currentFavoritePage=currentFavoritePage-1" ng-show="currentFavoritePage > 1">< Back</div>
-                                {{currentFavoritePage}}/{{favoriteList.length/perFavoritePage | number:0}}
-                                <div class="pull-right footer-pagination" ng-click="currentFavoritePage=currentFavoritePage+1" ng-show="currentFavoritePage < (favoriteList.length/perFavoritePage|number:0)">Next ></div>
+                                {{currentFavoritePage}}/{{Math.ceil(favoriteList.length/perFavoritePage)}}
+                                <div class="pull-right footer-pagination" ng-click="currentFavoritePage=currentFavoritePage+1" ng-show="currentFavoritePage < Math.ceil(favoriteList.length/perFavoritePage)">Next ></div>
                             </div>
                         </div>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="content-saved-recommend">
-                        <div class="saved-list" ng-init="currentRecommendPage=1;perRecommendPage=16">
-                            <div class="saved-item" ng-repeat="item in recommendList | limitTo:perRecommendPage:((currentRecommendPage-1)*perRecommendPage) track by $index" ng-click="restoreSaved(item)" title="<img src='{{item.thumb}}' style='width:200px;background:#e2e2e2;margin:0;padding:0;margin-left:-8px;border:0'/>" data-toggle="tooltip">
+                        <div class="saved-list" ng-init="currentRecommendPage=1;perRecommendPage=18">
+                            <div class="saved-item" ng-repeat="item in (recommendList | limitTo:perRecommendPage:((currentRecommendPage-1)*perRecommendPage)) track by $index" ng-click="restoreSaved(item)" title="<img src='{{item.thumb}}' style='width:200px;background:#e2e2e2;margin:0;padding:0;margin-left:-8px;border:0'/>" data-toggle="tooltip">
                                 <img ng-src="{{item.thumb}}"/>
                             </div>
                             <div class="clearfix"></div>
                             <div class="footer-bar">
                                 <div class="pull-left footer-pagination" ng-click="currentRecommendPage=currentRecommendPage-1" ng-show="currentRecommendPage > 1">< Back</div>
-                                {{currentRecommendPage}}/{{recommendList.length/perRecommendPage | number:0}}
-                                <div class="pull-right footer-pagination" ng-click="currentRecommendPage=currentRecommendPage+1" ng-show="currentRecommendPage < (recommendList.length/perRecommendPage|number:0)">Next ></div>
+                                {{currentRecommendPage}}/{{Math.ceil(recommendList.length/perRecommendPage)}}
+                                <div class="pull-right footer-pagination" ng-click="currentRecommendPage=currentRecommendPage+1" ng-show="currentRecommendPage < Math.ceil(recommendList.length/perRecommendPage)">Next ></div>
                             </div>
                         </div>
                     </div>
-- 
1.8.5.3