refactor(item.status): modification on CASE of status in order to use…

… ENUM Close #31
davinkevin · Sep 5, 2015 · f7a6de5 · f7a6de5
1 parent 4e0ee70
commit f7a6de5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/src/main/resources/static/app/html/download.html b/src/main/resources/static/app/html/download.html
@@ -18,7 +18,7 @@
         <div class="buttonList pull-right">
             <br/>
             <button ng-click="dc.toggleDownload(item)" type="button" class="btn btn-sm"
-                    ng-class="{'btn-primary' : item.status === 'Started', 'btn-warning' : item.status === 'Paused'}"><i class="glyphicon glyphicon-play"></i><i class="glyphicon glyphicon-pause"></i></button>
+                    ng-class="{'btn-primary' : item.status === 'STARTED', 'btn-warning' : item.status === 'PAUSED'}"><i class="glyphicon glyphicon-play"></i><i class="glyphicon glyphicon-pause"></i></button>
             <button ng-click="dc.stopDownload(item)" type="button" class="btn btn-danger btn-sm"><span class="glyphicon glyphicon-stop"></span></button>
         </div>
 

diff --git a/src/main/resources/static/app/html/item-detail.html b/src/main/resources/static/app/html/item-detail.html
@@ -19,13 +19,13 @@
 
                     <div class="buttonList text-center">
                         <!-- Téléchargement en cours -->
-                        <span ng-show="idc.item.status == 'Started' || idc.item.status == 'Paused'" >
+                        <span ng-show="idc.item.status == 'STARTED' || idc.item.status == 'PAUSED'" >
                             <button ng-click="idc.toggleDownload(idc.item)" type="button" class="btn btn-primary "><i class="glyphicon glyphicon-play"></i><i class="glyphicon glyphicon-pause"></i></button>
                             <button ng-click="idc.stopDownload(idc.item)" type="button" class="btn btn-danger"><span class="glyphicon glyphicon-stop"></span></button>
                         </span>
 
                         <!-- Lancer le téléchargement -->
-                        <button ng-click="idc.item.download()" ng-show="(idc.item.status != 'Started' && idc.item.status != 'Paused' ) && !idc.item.isDownloaded" type="button" class="btn btn-primary"><span class="glyphicon glyphicon-save"></span></button>
+                        <button ng-click="idc.item.download()" ng-show="(idc.item.status != 'STARTED' && idc.item.status != 'PAUSED' ) && !idc.item.isDownloaded" type="button" class="btn btn-primary"><span class="glyphicon glyphicon-save"></span></button>
 
                         <a ng-href="/podcasts/{{ idc.item.podcast.id }}/item/{{ idc.item.id }}/play" ng-show="idc.item.isDownloaded" type="button" class="btn btn-success"><span class="ionicons ion-social-youtube"></span></a>
 
@@ -39,7 +39,7 @@
                             <button type="button" class="btn btn-default dropdown-toggle" dropdown-toggle><i class="glyphicon glyphicon-option-vertical"></i></button>
                             <ul class="dropdown-menu dropdown-menu-right" role="menu">
                                 <li ng-show="idc.item.isDownloaded"><a target="_self" ng-href="{{ idc.item.proxyURL }}"><span class="glyphicon glyphicon-play text-success"></span> Lire</a></li>
-                                <li><a ng-click="idc.remove(idc.item)" ng-show="(idc.item.status != 'Started' && idc.item.status != 'Paused' )"><span class="glyphicon glyphicon-remove text-danger"></span> Retirer</a></li>
+                                <li><a ng-click="idc.remove(idc.item)" ng-show="(idc.item.status != 'STARTED' && idc.item.status != 'PAUSED' )"><span class="glyphicon glyphicon-remove text-danger"></span> Retirer</a></li>
                                 <li><a ng-href="{{ idc.item.url }}" target="_self"><span class="glyphicon glyphicon-globe text-info"></span> Lire en ligne</a></li>
                                 <li><a ng-click="idc.reset(idc.item)"><span class="glyphicon glyphicon-repeat"></span> Reset</a></li>
                             </ul>

diff --git a/src/main/resources/static/app/html/items-search.html b/src/main/resources/static/app/html/items-search.html
@@ -49,16 +49,16 @@
                     <div class="btn-group" dropdown>
                         <button type="button" class="btn dropdown dropdown-toggle" dropdown-toggle><i class="glyphicon glyphicon-option-vertical"></i></button>
                         <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                            <li ng-show="item.status == 'Started' || item.status == 'Paused'">
-                                <a ng-show="item.status == 'Started'" ng-click="isc.toggleDownload(item)"><i class="glyphicon glyphicon-play text-primary"></i><i class="glyphicon glyphicon-pause text-primary"></i> Mettre en pause</a>
-                                <a ng-show="item.status == 'Paused'" ng-click="isc.toggleDownload(item)"><i class="glyphicon glyphicon-play text-primary"></i><i class="glyphicon glyphicon-pause text-primary"></i> Reprendre</a>
+                            <li ng-show="item.status == 'STARTED' || item.status == 'PAUSED'">
+                                <a ng-show="item.status == 'STARTED'" ng-click="isc.toggleDownload(item)"><i class="glyphicon glyphicon-play text-primary"></i><i class="glyphicon glyphicon-pause text-primary"></i> Mettre en pause</a>
+                                <a ng-show="item.status == 'PAUSED'" ng-click="isc.toggleDownload(item)"><i class="glyphicon glyphicon-play text-primary"></i><i class="glyphicon glyphicon-pause text-primary"></i> Reprendre</a>
                             </li>
-                            <li ng-show="item.status == 'Started' || item.status == 'Paused'">
+                            <li ng-show="item.status == 'STARTED' || item.status == 'PAUSED'">
                                 <a ng-click="isc.stopDownload(item)">
                                     <span class="glyphicon glyphicon-stop text-danger"></span> Stopper
                                 </a>
                             </li>
-                            <li ng-show="(item.status != 'Started' && item.status != 'Paused' ) && !item.isDownloaded">
+                            <li ng-show="(item.status != 'STARTED' && item.status != 'PAUSED' ) && !item.isDownloaded">
                                 <a ng-click="item.download()">
                                     <span class="glyphicon glyphicon-save text-primary"></span> Télécharger
                                 </a>

diff --git a/src/main/resources/static/app/html/podcast-details-episodes.html b/src/main/resources/static/app/html/podcast-details-episodes.html
@@ -3,19 +3,19 @@
     <div class="media clearfix"  ng-repeat="item in pic.podcast.items | orderBy:'-pubdate' track by item.id">
         <div class="buttonList pull-right">
             <!-- Téléchargement en cours -->
-        <span ng-show="item.status == 'Started' || item.status == 'Paused'" >
+        <span ng-show="item.status == 'STARTED' || item.status == 'PAUSED'" >
             <button ng-click="pic.toggleDownload(item)" type="button" class="btn btn-primary "><i class="glyphicon glyphicon-play"></i><i class="glyphicon glyphicon-pause"></i></button>
             <button ng-click="pic.stopDownload(item)" type="button" class="btn btn-danger"><span class="glyphicon glyphicon-stop"></span></button>
         </span>
 
             <!-- Lancer le téléchargement -->
-            <button ng-click="item.download()" ng-show="(item.status != 'Started' && item.status != 'Paused' ) && !item.isDownloaded" type="button" class="btn btn-primary"><span class="glyphicon glyphicon-save"></span></button>
+            <button ng-click="item.download()" ng-show="(item.status != 'STARTED' && item.status != 'PAUSED' ) && !item.isDownloaded" type="button" class="btn btn-primary"><span class="glyphicon glyphicon-save"></span></button>
 
             <!-- Lire dans le player -->
             <a ng-href="/podcasts/{{ item.podcastId }}/item/{{ item.id }}/play" ng-show="item.isDownloaded" type="button" class="btn btn-success"><span class="ionicons ion-social-youtube"></span></a>
 
             <!-- Supprimer l'item -->
-            <button ng-click="pic.remove(item)" ng-show="(item.status != 'Started' && item.status != 'Paused' )" type="button" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span></button>
+            <button ng-click="pic.remove(item)" ng-show="(item.status != 'STARTED' && item.status != 'PAUSED' )" type="button" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span></button>
 
             <!-- Menu complémentaire -->
             <div class="btn-group" dropdown is-open="isopen">

diff --git a/src/main/resources/static/app/js/modules/download/download.es6.js b/src/main/resources/static/app/js/modules/download/download.es6.js
@@ -30,14 +30,14 @@ class DownloadCtrl {
         let item = JSON.parse(message.body);
         let elemToUpdate = _.find(this.items, { 'id': item.id });
         switch (item.status) {
-            case 'Started' :
-            case 'Paused' :
+            case 'STARTED' :
+            case 'PAUSED' :
                 if (elemToUpdate)
                     _.assign(elemToUpdate, item);
                 else
                     this.items.push(item);
                 break;
-            case 'Finish' :
+            case 'FINISH' :
                 try {
                     this.$notification('Téléchargement terminé', {
                         body: item.title,
@@ -49,7 +49,7 @@ class DownloadCtrl {
                 }
                 this.onStoppedFromWS(elemToUpdate);
                 break;
-            case 'Stopped' :
+            case 'STOPPED' :
                 this.onStoppedFromWS(elemToUpdate);
                 break;
         }
@@ -69,7 +69,7 @@ class DownloadCtrl {
     }
 
     getTypeFromStatus(item) {
-        if (item.status === "Paused")
+        if (item.status === "PAUSED")
             return "warning";
         return "info";
     }