API tools faq
paste
Advertisement
Guest User

patch.1.19.8.patch

a guest
Jul 25th, 2016
70
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 8.91 KB | None | 0 0
raw download clone embed print report
  1. diff -Naur premiados-server-v.1.19.7/backoffice/client/app/insta-prizes/insta-prizes.controller.js premiados-server-v.1.19.8/backoffice/client/app/insta-prizes/insta-prizes.controller.js
  2. --- premiados-server-v.1.19.7/backoffice/client/app/insta-prizes/insta-prizes.controller.js 2016-07-25 17:20:17.000000000 -0300
  3. +++ premiados-server-v.1.19.8/backoffice/client/app/insta-prizes/insta-prizes.controller.js 2016-07-25 23:21:27.000000000 -0300
  4. @@ -42,7 +42,6 @@
  5.  
  6.              return InstaPrize.gameType({gameType: $scope.gameType.gameType}).$promise
  7.                  .then(function(players) {
  8. -
  9.                      if (players.length > 0) {
  10.  
  11.                          var array = [];
  12. @@ -77,6 +76,8 @@
  13.          $scope.filterOptions = [
  14.              {'name': 'Partidas ganadas', 'filter': '-wons', },
  15.              {'name': 'Partidas jugadas', 'filter': '-played'},
  16. +            {'name': 'Id (Descendente)', 'filter': '-id'},
  17. +            {'name': 'Ultima actividad', 'filter': '-lastActivity'},
  18.          ];
  19.  
  20.          $scope.ordering= function(){
  21. @@ -86,10 +87,20 @@
  22.                  $scope.players= $scope.players.sort(function(obj1, obj2) {
  23.  
  24.                      if($scope.selectedOrder.filter == '-wons'){
  25. -                        return  obj2.value.played - obj1.value.played;
  26. +                        return  obj2.value.wons - obj1.value.wons;
  27.                      }
  28.                      else if($scope.selectedOrder.filter == '-played'){
  29. -                        return  obj2.value.wons - obj1.value.wons;
  30. +                        return  obj2.value.played - obj1.value.played;
  31. +                    }
  32. +                    else if($scope.selectedOrder.filter == '-id' ){
  33. +                        if( obj1._id > obj2._id ) return -1;
  34. +                        if( obj1._id < obj2._id ) return  1;
  35. +                        return 0;
  36. +                    }
  37. +                    else if($scope.selectedOrder.filter == '-lastActivity' ){
  38. +                        if( obj1.lastActivity > obj2.lastActivity ) return -1;
  39. +                        if( obj1.lastActivity < obj2.lastActivity ) return  1;
  40. +                        return 0;
  41.                      }
  42.  
  43.                  });
  44. @@ -110,15 +121,7 @@
  45.          $scope.dropboxitemselected = function (item) {
  46.              $scope.selectedOrder = item;
  47.              $scope.isFiltering = true;
  48. -
  49. -            $scope.players= $scope.players.sort(function(obj1, obj2) {
  50. -                if($scope.selectedOrder.filter == '-played'){
  51. -                return  obj2.value.played - obj1.value.played;
  52. -                }
  53. -                else{
  54. -                    return  obj2.value.wons - obj1.value.wons;
  55. -                }
  56. -            });
  57. +            $scope.ordering();
  58.          }
  59.  
  60.          $scope.showSelection = function(){
  61. @@ -336,10 +339,30 @@
  62.          $scope.filterOptions = [
  63.              {'name': 'Partidas ganadas', 'filter': '-wons', },
  64.              {'name': 'Partidas jugadas', 'filter': '-played'},
  65. +            {'name': 'Id (Descendente)', 'filter': '-id'},
  66. +            {'name': 'Ultima actividad', 'filter': '-lastActivity'},
  67.          ];
  68.  
  69.          $scope.ordering = function(){
  70. -            $scope.players = $filter('orderBy')($scope.players, $scope.selectedOrder.filter);
  71. +            // $scope.players = $filter('orderBy')($scope.players, $scope.selectedOrder.filter);
  72. +            $scope.players= $scope.players.sort(function(obj1, obj2) {
  73. +                if($scope.selectedOrder.filter == '-wons'){
  74. +                    return  obj2.wons - obj1.wons;
  75. +                }
  76. +                else if($scope.selectedOrder.filter == '-played'){
  77. +                    return  obj2.played - obj1.played;
  78. +                }
  79. +                else if($scope.selectedOrder.filter == '-id' ){
  80. +                    if( obj1._id > obj2._id ) return -1;
  81. +                    if( obj1._id < obj2._id ) return  1;
  82. +                    return 0;
  83. +                }
  84. +                else if($scope.selectedOrder.filter == '-lastActivity' ){
  85. +                    if( obj1.lastActivity > obj2.lastActivity ) return -1;
  86. +                    if( obj1.lastActivity < obj2.lastActivity ) return  1;
  87. +                    return 0;
  88. +                }
  89. +            });
  90.          };
  91.  
  92.          $scope.defaultItems = function(){
  93. @@ -348,6 +371,7 @@
  94.          $scope.dropboxitemselected = function (item) {
  95.              $scope.selectedOrder = item;
  96.              $scope.isFiltering = true;
  97. +            $scope.ordering();
  98.          };
  99.  
  100.          $scope.showSelection = function(){
  101. diff -Naur premiados-server-v.1.19.7/backoffice/client/app/insta-prizes/tpls/insta-prizes-campaign.html premiados-server-v.1.19.8/backoffice/client/app/insta-prizes/tpls/insta-prizes-campaign.html
  102. --- premiados-server-v.1.19.7/backoffice/client/app/insta-prizes/tpls/insta-prizes-campaign.html    2016-07-25 17:20:17.000000000 -0300
  103. +++ premiados-server-v.1.19.8/backoffice/client/app/insta-prizes/tpls/insta-prizes-campaign.html    2016-07-25 23:21:27.000000000 -0300
  104. @@ -79,6 +79,12 @@
  105.                              <td class="col-sm-4" align="left" ng-show="selectedOrder.filter=='-played'">
  106.                                  <b> {{player.played}}</b>
  107.                              </td>
  108. +                            <td class="col-sm-4" align="left" ng-show="selectedOrder.filter=='-lastActivity'">
  109. +                                <b> {{player.lastActivity}}</b>
  110. +                            </td>
  111. +                            <td class="col-sm-4" align="left" ng-show="selectedOrder.filter=='-id'">
  112. +                                <b> {{player._id}}</b>
  113. +                            </td>
  114.  
  115.                          </tr>
  116.  
  117. @@ -196,4 +202,4 @@
  118.  
  119.      </div>
  120.  
  121. -</div>
  122. \ No hay ningún carácter de nueva línea al final del fichero
  123. +</div>
  124. diff -Naur premiados-server-v.1.19.7/backoffice/client/app/insta-prizes/tpls/insta-prizes-gametype.html premiados-server-v.1.19.8/backoffice/client/app/insta-prizes/tpls/insta-prizes-gametype.html
  125. --- premiados-server-v.1.19.7/backoffice/client/app/insta-prizes/tpls/insta-prizes-gametype.html    2016-07-25 17:20:17.000000000 -0300
  126. +++ premiados-server-v.1.19.8/backoffice/client/app/insta-prizes/tpls/insta-prizes-gametype.html    2016-07-25 23:21:28.000000000 -0300
  127. @@ -90,6 +90,13 @@
  128.                                  <b> {{player.value.played}}</b>
  129.                              </td>
  130.  
  131. +                            <td class="col-sm-4" align="left" ng-show="selectedOrder.filter=='-lastActivity'">
  132. +                                <b> {{player.lastActivity}}</b>
  133. +                            </td>
  134. +                            <td class="col-sm-4" align="left" ng-show="selectedOrder.filter=='-id'">
  135. +                                <b> {{player._id}}</b>
  136. +                            </td>
  137. +
  138.                              <td class="col-sm-2" align="left">
  139.                                  <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#voucherHistoryModal" ng-click="showUserInfo(player.value.fbUserId)">
  140.                                      <i class="fa fa-info-circle" aria-hidden="true"></i>
  141. diff -Naur premiados-server-v.1.19.7/backoffice/server/api/insta-prize/insta-prize.controller.js premiados-server-v.1.19.8/backoffice/server/api/insta-prize/insta-prize.controller.js
  142. --- premiados-server-v.1.19.7/backoffice/server/api/insta-prize/insta-prize.controller.js   2016-07-25 17:20:17.000000000 -0300
  143. +++ premiados-server-v.1.19.8/backoffice/server/api/insta-prize/insta-prize.controller.js   2016-07-25 23:21:27.000000000 -0300
  144. @@ -149,6 +149,7 @@
  145.                              played: 0,
  146.                              fbUserId: data[i].fbUserId,
  147.                              fullName: data[i].fullName,
  148. +                            _id: data[i].playerId
  149.                          }
  150.                      }
  151.  
  152. @@ -217,14 +218,16 @@
  153.              playerStatus: this.player1Status,
  154.              fbUserId: this.player1FbUserId,
  155.              fullName: this.player1FullName,
  156. -            winnerId: this.winner
  157. +            winnerId: this.winner,
  158. +            _id: this.player1._id
  159.          });
  160.  
  161.          emit(this.player2, {
  162.              playerStatus: this.player2Status,
  163.              fbUserId: this.player2FbUserId,
  164.              fullName: this.player2FullName,
  165. -            winnerId: this.winner
  166. +            winnerId: this.winner,
  167. +            _id: this.player2._id
  168.          });
  169.  
  170.      };
  171. @@ -235,7 +238,8 @@
  172.              wons: 0,
  173.              played: 0,
  174.              fbUserId: data[0].fbUserId,
  175. -            fullName: data[0].fullName
  176. +            fullName: data[0].fullName,
  177. +            _id: data[0].id
  178.          };
  179.  
  180.          playerId = playerId.toString();
  181. @@ -264,7 +268,8 @@
  182.              wons: 0,
  183.              played: 0,
  184.              fbUserId: reduced.fbUserId,
  185. -            fullName: reduced.fullName
  186. +            fullName: reduced.fullName,
  187. +            _id: reduced._id
  188.          };
  189.  
  190.          if (reduced.playerStatus != 1 && reduced.playerStatus != 3) {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!