less commented lines

adumas
1 parent 9f2e1cf7
Showing 3 changed files with 3 additions and 139 deletions
src/main/resources/web/js/models/voipmodel.js
src/main/resources/web/js/views/voip.js
src/main/resources/web/tpl/voip.html
@@ -5,14 +5,7 @@ window.callStatsModel = Backbone.Model.extend({
 		elapsedTime: 'default',
  
 		iMOS0: null,
-		delay0: null,
-		jitter0: null,
-		loss0: null,
-
 		iMOS1: null,
-		delay1: null,
-		jitter1: null,
-		loss1: null
 	},
 });
 window.switchCallsStatsCollection = Backbone.Collection.extend({
@@ -107,13 +100,7 @@ window.allStatsCollection = Backbone.Collection.extend({
 											var stat= new callStatsModel();
 											stat.elapsedTime=vs.elapsedTime;
 											stat.iMOS0=vs.iMOS0;
-											/*stat.delay0=vs.delay0;
-											stat.jitter0=vs.jitter0;
-											stat.loss0=vs.loss0;*/
 											stat.iMOS1=vs.iMOS1;
-											/*stat.delay1=vs.delay1;
-											stat.jitter1=vs.jitter1;
-											stat.loss1=vs.loss1;*/
 											scscm.scsc.add(stat);
 											//console.log("stat added: "+stat.elapsedTime +" : "+vs.elapsedTime);
  
@@ -321,10 +308,6 @@ window.VoIPCollection = Backbone.Collection.extend({
 									src0:vs.caller, dst0:vs.receiver, 
 									src1:vs.receiver, dst1:vs.caller, 
 									RTPPort:vs.RTPPort  });
-								
-								/*scscm = new switchCallsStatsCollectionModel();		//We add the call to the stats
-								scscm.id=vs.idvoip;									//so that we can start metrics
-								allStats.get(self.idswitch).ssc.add(scscm);*/
 							}
 						});
 					});
@@ -15,8 +15,7 @@ window.VoIPGraphView = Backbone.View.extend({
  
 		console.log("VoIPGraphView init" );
         this.template = _.template(tpl.get('voip-graph'));
-        //this.model.bind("change", this.render, this);
-        //this.model.bind("add", this.render, this);
+        
         Chart.defaults.global = {
 		    animation: false,		    		// Boolean - Whether to animate the chart
 		    animationSteps: 60,		    		// Number - Number of animation steps
@@ -41,10 +40,7 @@ window.VoIPGraphView = Backbone.View.extend({
 		    showTooltips: true,		    		// Boolean - Determines whether to draw tooltips on the canvas or not
 		    onAnimationProgress: function(){},	// Function - Will fire on animation progression.
 		    onAnimationComplete: function(){}	// Function - Will fire on animation completion.
-
 		};
-        
-        
     },
  
     render:function (eventName) {
@@ -131,58 +127,12 @@ window.VoIPGraphView = Backbone.View.extend({
  
  
  
-/*
-window.Stats0ListItemView = Backbone.View.extend({
-    
-    tagName:"tr",
-    
-    initialize:function () {
-    	//console.log("Initializing call0 stats");
-        this.template = _.template(tpl.get('call0'));
-        //this.bind("add", this.render, this);
-    },
-
-    render:function (eventName) {
-    	//console.log("Rendering call0 stats");
-        $(this.el).html(this.template({elapsedTime:this.model.elapsedTime,iMOS0:this.model.iMOS0,
-        	loss0:this.model.loss0,delay0:this.model.delay0,jitter0:this.model.jitter0}));
-		
-        return this;
-    },
-
-});
-
-window.Stats1ListItemView = Backbone.View.extend({
-    
-    tagName:"tr",
-    
-    initialize:function () {
-    	//console.log("Initializing call1 stats");
-        this.template = _.template(tpl.get('call1'));
-        //this.bind("add", this.render, this);
-    },
-
-    render:function (eventName) {
-    	//console.log("Rendering call1 stats");
-        $(this.el).html(this.template({elapsedTime:this.model.elapsedTime,iMOS1:this.model.iMOS1,
-        	loss1:this.model.loss1,delay1:this.model.delay1,jitter1:this.model.jitter1}));
-		
-        return this;
-    },
-
-});*/
  
 window.VoIPView = Backbone.View.extend({
  
 	model: VoIP,
  
-	/*defaults: {
-		historic0View:null,
-		historic1View:null,
-	},*/
-	
 	events: {
-    	//"click input[name=historic0]" : "showHistoric0",
 		"click input[name=export]" : "Export",
 		"click img" : "clicked",
     },
@@ -198,39 +148,17 @@ window.VoIPView = Backbone.View.extend({
     initialize:function () {
 		//console.log("VoIPView init" )
         this.template = _.template(tpl.get('voip'));
-        //this.model.bind("change", this.render, this);
         this.model.bind("add", this.render, this);
-        /*historic0View=false;
-        historic1View=false;*/
+
     },
  
     render:function (eventName) {
 		$(this.el).html(this.template(this.model.toJSON()));
-		//console.log("voip render: "+v.id+" : "+v.idswitch);
-		
-		/*/rendering the stats historic
-		if(allStats.get(v.idswitch).ssc.get(v.id)!=undefined && historic0View==true){
-			_.each(allStats.get(v.idswitch).ssc.get(v.id).scsc.models, function (stat) {
-	            $(this.el).find('table.call0-table > tbody')
-	                .append(new Stats0ListItemView({model:stat}).render().el);
-	        }, this);
-        }//*//*
-        if(allStats.get(v.idswitch).ssc.get(v.id)!=undefined && historic1View==true){
-			_.each(allStats.get(v.idswitch).ssc.get(v.id).scsc.models, function (stat) {
-	            $(this.el).find('table.call1-table > tbody')
-	                .append(new Stats1ListItemView({model:stat}).render().el);
-	        }, this);
-        }//*/		
-
-		/*if (historic0View==true){$(this.el).find("#2").toggle();}
-		if (historic1View==true){$(this.el).find("#3").toggle();}*/
 		$(this.el).addClass("src0");
         return this;
 	},
  
 	Export:function(e){
-		/*if (historic0View==true){historic0View=false;}
-        else {historic0View=true;}*/
        var self=this;
         console.log("Export on "+self.model.idswitch);
         $.ajax({
@@ -246,13 +174,6 @@ window.VoIPView = Backbone.View.extend({
 	    });
  
     },
-    
-	/*showHistoric1:function(e){
-        //$(this.el).find("#3").toggle();
-        if (historic1View==true){historic1View=false;}
-        else {historic1View=true;}
-    },*/
-    
  
 });
  
@@ -310,8 +231,6 @@ window.VoIPListView = Backbone.View.extend({
         return this;
     },
     Export:function(e){
-		/*if (historic0View==true){historic0View=false;}
-        else {historic0View=true;}*/
        var self=this;
         console.log("Export on "+self.model.idswitch);
         $.ajax({
@@ -20,7 +20,7 @@
 </div>
  
 <table class="table table-striped voip-table">
-	<tr><th>SSRC</th><th>src</th><th>dst</th><th>iMOS</th><th>Delay (ms)</th><th>Jitter (ms)</th><th>Loss (%)</th><th><a href="/voip/<%= idswitch %>/<%= idvoip %>/graph" >Graph</a></th></tr>
+	<tr><th>SSRC</th><th>src</th><th>dst</th><th>iMOS</th><th>Delay (ms)</th><th>Jitter (ms)</th><th>Loss (%)</th></tr>
 	<tr id="0">
 	    <td><%= id0 %></td>
 		<td><%= src0 %></td>
@@ -29,27 +29,8 @@
 		<td><%= delay0 %></td>
 		<td><%= jitter0 %></td>
 		<td><%= loss0 %></td>
-		<!--<td><input type="button"  value="historic" name="historic0"/><span> </span></td>-->
 	</tr>
  
-	<!--<tr id="2" style="display:none">
-		<td></td><td></td><td colspan="5">
-			<div style="max-height:100px;overflow:auto;">
-				<table class="table table-striped call0-table">
-					<tr>
-						<th style="background-color:#DCDCDC;">Elapsed time</th>
-						<th style="background-color:#DCDCDC;">iMOS</th>
-						<th style="background-color:#DCDCDC;">Delay</th>
-						<th style="background-color:#DCDCDC;">Jitter</th>
-						<th style="background-color:#DCDCDC;">Loss</th>
-					</tr>
-					<tbody>
-						<!-- switches will be inserted here by SwitchListView:render -->
-					<!--</tbody>
-				</table>
-			</div>
-		</td>
-	</tr>-->
  
 	<tr id="1">
 		<td><%= id1 %></td>
@@ -59,26 +40,7 @@
 		<td><%= delay1 %></td>
 		<td><%= jitter1 %></td>
 		<td><%= loss1 %></td>
-		<!--<td><input type="button"  value="historic" name="historic1"/><span> </span></td>-->
 	</tr>
-	<!--<tr id="3" style="display:none">
-		<td></td><td></td><td colspan="5">
-			<div style="max-height:100px;overflow:auto;">
-				<table class="table table-striped call1-table">
-					<tr>
-						<th style="background-color:#DCDCDC;">Elapsed time</th>
-						<th style="background-color:#DCDCDC;">iMOS</th>
-						<th style="background-color:#DCDCDC;">Delay</th>
-						<th style="background-color:#DCDCDC;">Jitter</th>
-						<th style="background-color:#DCDCDC;">Loss</th>
-					</tr>
-					<tbody>
-						<!-- switches will be inserted here by SwitchListView:render -->
-					<!--</tbody>
-				</table>
-			</div>
-		</td>
-	</tr>-->
 </table>
 </div>
 </div>