processed web

back/db.py

@@ -33,9 +33,9 @@ class db():
     def cut(self, _id=None):
         ret = None
         if _id:
-            ret = jsonable(self.cut.find_one({"_id": ObjectId(_id)}))
+            ret = jsonable(self.cut_files.find_one({"_id": ObjectId(_id)}))
         else:
-            ret = [ jsonable(fix_date(c)) for c in self.cut.find() ]
+            ret = [ jsonable(fix_date(c)) for c in self.cut_files.find() ]
 
         return ret
 

front/app.js

@@ -13,7 +13,7 @@ app.config(['$routeProvider', '$locationProvider', function ($routeProvider, $lo
 	})
 	.when('/processed', {
 		templateUrl: 'views/processed.html',
-		controller: 'rawCtrl'
+		controller: 'processedCtrl'
 	})
 	.when('/cut/:id', {
 		templateUrl: 'views/cut.html',

front/controllers/processedCtrl.js

@@ -0,0 +1,29 @@
+app.controller('processedCtrl', ['$scope', '$http', function ($scope, $http) {
+	$scope.update = function() {
+		$http.get('back/list/cut').success(function(data) {
+	   		$scope.videolist = data.list.map(function(el) {
+				if (el.end_time.indexOf(":") == -1 ) { //1800 => 0:30:00
+					el.end_time=toHHMMSS(el.end_time);
+				}
+				if (el.start_time.indexOf(":") == -1 ) { //1800 => 0:30:00
+					el.start_time=toHHMMSS(el.start_time);
+				}
+				return el;
+			});
+		});
+	};
+
+	$scope.update();
+
+	function toHHMMSS (t) {
+		var sec_num = parseInt(t, 10); // don't forget the second param
+		var hours   = Math.floor(sec_num / 3600);
+		var minutes = Math.floor((sec_num - (hours * 3600)) / 60);
+		var seconds = sec_num - (hours * 3600) - (minutes * 60);
+		
+		if (hours   < 10) {hours   = "0"+hours;}
+		if (minutes < 10) {minutes = "0"+minutes;}
+		if (seconds < 10) {seconds = "0"+seconds;}
+		return hours+':'+minutes+':'+seconds;
+	}
+}]);

front/controllers/rawCtrl.js

@@ -1,7 +1,7 @@
 app.controller('rawCtrl', ['$scope', '$http', function ($scope, $http) {
 
 	$scope.update = function() {
-		$http.get('back/raw').success(function(data) {
+		$http.get('back/list/raw').success(function(data) {
 	   		$scope.rawlist = data.list; 
 		});
 	};

front/index.html

@@ -15,6 +15,7 @@
 	<script type="text/javascript" src="/js/angular-notify/dist/angular-notify.js"></script>
 	<script type="text/javascript" src="/app.js"></script>
 	<script type="text/javascript" src="/controllers/rawCtrl.js"></script>
+	<script type="text/javascript" src="/controllers/processedCtrl.js"></script>
 	<script type="text/javascript" src="/controllers/cutCtrl.js"></script>
     <base href="/" />
 </head>
@@ -27,9 +28,21 @@
 	<div class="clear"></div>
 	<div class="container">
 		<ul class="video-tabs" ng-controller="videotabs">
-			<li><a href="/" ng-class="{'active-tab':activeTab==='raw'}" ng-click="changeTab('raw')">RAW</a></li>
-			<li><a href="/jobs" ng-class="{'active-tab':activeTab==='jobs'}" ng-click="changeTab('jobs')">JOBS</a></li>
-			<li><a href="/processed" ng-class="{'active-tab':activeTab==='finish'}" ng-click="changeTab('finish')">PROCESADO</a></li>
+			<li>
+				<a href="/" ng-class="{'active-tab':activeTab==='raw'}" ng-click="changeTab('raw')">
+					Raw
+				</a>
+			</li>
+			<li>
+				<a href="/processed" ng-class="{'active-tab':activeTab==='finish'}" ng-click="changeTab('finish')">
+					Cortados
+				</a>
+			</li>
+			<li>
+				<a href="/jobs" ng-class="{'active-tab':activeTab==='jobs'}" ng-click="changeTab('jobs')">
+					Estado
+				</a>
+			</li>
 		</ul>
 		<div ng-view=""></div>
 	</div>

front/views/processed.html

@@ -1,24 +1,32 @@
 <div>
 <table class="table table-striped">
 	<tr>
-		<th>Fecha</th>
-		<th>Archivo</th>
-		<th>Curso</th>
-		<th>Descripcion</th>
+		<th>Inicio</th>
+		<th>Fin</th>
+		<th>Inicio2</th>
+		<th>Fin2</th>
+		<th>Archivo Crudo</th>
+		<th>Archivo Procesado</th>
 		<th>Subir</th>
 	</tr>
 	<tr ng-repeat="v in videolist">
 		<td>
-			{{v.date}}
+			{{v.job_start}}
 		</td>
 		<td>
-			{{v.file}}
+			{{v.job_end}}
 		</td>
 		<td>
-			{{v.curso}}
+			{{v.start_time}}
 		</td>
 		<td>
-			{{v.desc}}
+			{{v.end_time}}
+		</td>
+		<td>
+			{{v.in_fname}}
+		</td>
+		<td>
+			{{v.out_fname}}
 		</td>
 		<td>
 			<a ng-href="/#/cut/{{r._id}}">subir</a>