[chronojump] Added 2 graphs to server



commit a41fe36edf40220608d1aacfd60258a299893537
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Jun 3 13:55:58 2011 +0200

    Added 2 graphs to server

 chronojump_server/r-sqlite/evaluators.R            |   23 +++-
 chronojump_server/r-sqlite/ieiub.R                 |   62 +++++++++
 chronojump_server/r-sqlite/persons.R               |   12 ++-
 chronojump_server/r-sqlite/tf_by_extra_weight.R    |   59 ++++++++
 ...ts_by_jumps_boxplot.R => tf_by_jumps_boxplot.R} |    6 +-
 ...l_sex_jumptype.R => tf_by_level_sex_jumptype.R} |    8 +-
 chronojump_server/r-sqlite/update-r-graphs         |   19 ++-
 diagrams/classes/sqlite.dia                        |  Bin 4372 -> 5171 bytes
 web/server.html                                    |  141 +++++++++++++++-----
 web/server_es.html                                 |  142 +++++++++++++++-----
 web/style.css                                      |    1 +
 11 files changed, 381 insertions(+), 92 deletions(-)
---
diff --git a/chronojump_server/r-sqlite/evaluators.R b/chronojump_server/r-sqlite/evaluators.R
index d08d7b3..468cb5b 100644
--- a/chronojump_server/r-sqlite/evaluators.R
+++ b/chronojump_server/r-sqlite/evaluators.R
@@ -7,14 +7,29 @@ con = dbConnect(drv, file)
 
 jumps <- dbGetQuery(con, "SELECT COUNT(jump.uniqueID) AS conta, SEvaluator.name AS names FROM jump, SEvaluator, session WHERE jump.sessionID=session.uniqueID AND session.evaluatorID=Sevaluator.uniqueID GROUP BY SEvaluator.name ORDER BY SEvaluator.name;")
 
+jumpsRj <- dbGetQuery(con, "SELECT COUNT(jumpRj.uniqueID) AS conta, SEvaluator.name AS names FROM jumpRj, SEvaluator, session WHERE jumpRj.sessionID=session.uniqueID AND session.evaluatorID=Sevaluator.uniqueID GROUP BY SEvaluator.name ORDER BY conta DESC;")
+
 persons <- dbGetQuery(con, "SELECT COUNT(DISTINCT(person77.uniqueID)) AS conta, SEvaluator.name AS names FROM person77, SEvaluator, session, personSession77 WHERE person77.uniqueID=personSession77.personID AND session.uniqueID=personSession77.sessionID AND session.evaluatorID=Sevaluator.uniqueID GROUP BY SEvaluator.name ORDER BY SEvaluator.name;")
 
-colors=c(topo.colors(8)[3],topo.colors(8)[6])
-o.j.d <- order(jumps$conta, decreasing=T)
+def.par <- par(no.readonly = TRUE) # save default, for resetting...
+par(new=FALSE, oma=c(1,1,5,1))
+#nf <- layout(matrix(c(1,1,2,3), 2, 2, byrow=TRUE), respect=TRUE)
+par(mfcol=c(3,1))
+
+persons$names<-factor(persons$names)
+jumps$names<-factor(jumps$names)
+jumpsRj$names<-factor(jumpsRj$names)
+
+cex=.7
+dotchart(persons$conta[order (persons$conta)], labels=levels(persons$names)[order (persons$conta)], main="Persons", cex=cex)
+dotchart(jumps$conta[order (jumps$conta)], labels=levels(jumps$names)[order (jumps$conta)], main="Jumps (simple)", cex=cex)
+dotchart(jumpsRj$conta[order (jumpsRj$conta)], labels=levels(jumpsRj$names)[order (jumpsRj$conta)], main="Jumps (reactive)", cex=cex)
 
-barplot(rbind(jumps$conta[o.j.d], persons$conta[o.j.d]), beside=T, legend=c("Jumps","Persons"), names=jumps$names[o.j.d], col=colors)
 
-title(main="Jumps and persons count by evaluator",
+par(def.par)#- reset to default
+par(new=TRUE)
+plot(-1,type="n",axes=F,xlab='',ylab='')
+title(main="Data uploaded by evaluator",
   sub=paste(Sys.Date(),"(YYYY-MM-DD)"), cex.sub = 0.75, font.sub = 3, col.sub = "red")
 
 dev.off()
diff --git a/chronojump_server/r-sqlite/ieiub.R b/chronojump_server/r-sqlite/ieiub.R
new file mode 100644
index 0000000..7a4987a
--- /dev/null
+++ b/chronojump_server/r-sqlite/ieiub.R
@@ -0,0 +1,62 @@
+library(GDD)
+GDD(file="/var/www/web/server/images/ieiub.png", type="png", w=670, h=670)
+
+library(RSQLite)
+drv = dbDriver("SQLite")
+file = "/root/.local/share/Chronojump/database/chronojump_server.db"
+con = dbConnect(drv, file)
+
+def.par <- par(no.readonly = TRUE) # save default, for resetting...
+
+IE <- dbGetQuery(con, "SELECT person77.name, person77.sex AS sex, personSession77.practice AS level,  ( AVG(j1.tv) - AVG(j2.tv) )*100/(AVG(j2.tv)*1.0) AS myIndex, AVG(j1.tv), AVG(j2.tv) FROM jump AS j1, jump AS j2, person77, personSession77 WHERE j1.sessionID == j2.sessionID AND j1.type == 'CMJ'  AND j2.type == 'SJ'  AND j1.personID == person77.uniqueID  AND j2.personID == person77.uniqueID AND person77.UniqueID == personSession77.PersonID GROUP BY j1.personID, j1.sessionID ORDER BY  myIndex DESC")
+IUB <- dbGetQuery(con, "SELECT person77.name, person77.sex AS sex, personSession77.practice AS level,  ( AVG(j1.tv) - AVG(j2.tv) )*100/(AVG(j2.tv)*1.0) AS myIndex, AVG(j1.tv), AVG(j2.tv) FROM jump AS j1, jump AS j2, person77, personSession77 WHERE j1.sessionID == j2.sessionID AND j1.type == 'ABK'  AND j2.type == 'CMJ'  AND j1.personID == person77.uniqueID  AND j2.personID == person77.uniqueID AND person77.UniqueID == personSession77.PersonID GROUP BY j1.personID, j1.sessionID ORDER BY  myIndex DESC")
+IEm <- subset (IE, IE$sex == 'M')
+IEf <- subset (IE, IE$sex == 'F')
+IUBm <- subset (IUB, IUB$sex == 'M')
+IUBf <- subset (IUB, IUB$sex == 'F')
+
+par(new=FALSE, oma=c(1,1,5,1))
+par(mfcol=c(2,2))
+levels=c("sed.", "regul.", "compet.", "elite")
+
+bp = boxplot(IEm$myIndex~IEm$level, main="IE Man by practice level",  axes=F)
+text(1:4, -5, paste("n=",format(bp$n),sep=""), xpd = TRUE)
+mtext("IE=100*(CMJ-SJ)/SJ", cex=.7)
+axis(1, at = 1:4, labels = levels)
+axis(2)
+box()
+abline(h=0)
+
+bp = boxplot(IUBm$myIndex~IUBm$level, main="IUB Man by practice level",  axes=F)
+text(1:4, -5, paste("n=",format(bp$n),sep=""), xpd = TRUE)
+mtext("IUB=100*(ABK-CMJ)/CMJ",cex=.7)
+axis(1, at = 1:4, labels = levels)
+axis(2)
+box()
+abline(h=0)
+
+bp = boxplot(IEf$myIndex~IEf$level, main="IE Woman by practice level", axes=F)
+text(1:4, -5, paste("n=",format(bp$n),sep=""), xpd = TRUE)
+mtext("IE=100*(CMJ-SJ)/SJ",cex=.7)
+axis(1, at = 1:4, labels = levels)
+axis(2)
+box()
+abline(h=0)
+
+bp = boxplot(IUBf$myIndex~IUBf$level, main="IUB Woman by practice level", axes=F)
+text(1:4, -5, paste("n=",format(bp$n),sep=""), xpd = TRUE)
+mtext("IUB=100*(ABK-CMJ)/CMJ",cex=.7)
+axis(1, at = 1:4, labels = levels)
+axis(2)
+box()
+abline(h=0)
+
+
+par(def.par)#- reset to default
+
+par(new=TRUE)
+plot(-1,type="n",axes=F,xlab='',ylab='')
+title(main="Elasticity Index and Using Arms Index",
+  sub=paste("Values are AVG of both jumps of each person on every session. Date of graph: ",Sys.Date(),"(YYYY-MM-DD)"), cex.sub = 0.75, font.sub = 3, col.sub = "red")
+
+dev.off()
diff --git a/chronojump_server/r-sqlite/persons.R b/chronojump_server/r-sqlite/persons.R
index 946af48..54bd96c 100644
--- a/chronojump_server/r-sqlite/persons.R
+++ b/chronojump_server/r-sqlite/persons.R
@@ -7,9 +7,13 @@ con = dbConnect(drv, file)
 
 def.par <- par(no.readonly = TRUE) # save default, for resetting...
 
-
+#refered to person77
 persons <- dbGetQuery(con, "SELECT sport.name AS sport, speciallity.name AS speciallity, country.name AS country, person77.sex AS sex, personSession77.practice AS level FROM person77, personSession77, country, sport, speciallity WHERE person77.uniqueID=personSession77.personID AND person77.countryID = country.uniqueID AND personSession77.sportID == sport.uniqueID AND personSession77.speciallityID=speciallity.uniqueID GROUP BY personID")
 
+#done separately because it's refered to personSession77
+ages <- dbGetQuery(con, "SELECT (strftime('%Y', session.date) - strftime('%Y', person77.dateborn)) - (strftime('%m-%d', session.date) < strftime('%m-%d', person77.dateborn)) AS years from person77, personSession77, session WHERE personSession77.personID = person77.uniqueID AND personSession77.sessionID = session.UniqueID AND years>1")
+
+
 persons$sportF<-factor(persons$sport)
 #persons$speciallityF<-factor(persons$speciallity)
 persons$countryF<-factor(persons$country)
@@ -18,7 +22,7 @@ persons$levelF<-factor(persons$level)
 
 par(new=FALSE, oma=c(1,1,5,1))
 #par(mfcol=c(2,2))
-nf <- layout(matrix(c(1,1,1,2,3,4), 3, 2, byrow=FALSE), respect=TRUE)
+nf <- layout(matrix(c(1,1,2,3,4,5), 3, 2, byrow=FALSE), respect=TRUE)
 #layout.show(nf)
 
 dotchart(table(persons$sportF)[order (table(persons$sportF))], labels=levels(persons$sportF)[order (table(persons$sportF))], main="Sport")
@@ -27,7 +31,9 @@ dotchart(table(persons$sportF)[order (table(persons$sportF))], labels=levels(per
 
 dotchart(table(persons$countryF)[order (table(persons$countryF))], labels=levels(persons$countryF)[order (table(persons$countryF))], main="Country")
 
-pie(table(persons$sexF), labels=levels(persons$sexF), main="Sex", 
+hist(ages$years, breaks=10, main="Age", xlab="Years (at session day)")
+
+pie(table(persons$sexF), labels=levels(persons$sexF), main="Gender", 
   col=rainbow(length(levels(persons$sexF))))
 
 levels(persons$levelF)=c("Sedentary", "Regular practice", "Competition", "Elite") #undefined is impossible on server
diff --git a/chronojump_server/r-sqlite/tf_by_extra_weight.R b/chronojump_server/r-sqlite/tf_by_extra_weight.R
new file mode 100644
index 0000000..ffa3637
--- /dev/null
+++ b/chronojump_server/r-sqlite/tf_by_extra_weight.R
@@ -0,0 +1,59 @@
+library(GDD)
+GDD(file="/var/www/web/server/images/tf_by_extra_weight.png", type="png", w=670, h=670)
+
+library(RSQLite)
+drv = dbDriver("SQLite")
+file = "/root/.local/share/Chronojump/database/chronojump_server.db"
+con = dbConnect(drv, file)
+
+def.par <- par(no.readonly = TRUE) # save default, for resetting...
+
+SJlM <- dbGetQuery(con, "SELECT jump.tv AS TF, jump.weight AS Weight FROM jump, person77 WHERE (jump.type='SJ' OR jump.type='SJl')  AND person77.sex='M' AND jump.personID = person77.UniqueID")
+SJlF <- dbGetQuery(con, "SELECT jump.tv AS TF, jump.weight AS Weight FROM jump, person77 WHERE (jump.type='SJ' OR jump.type='SJl') AND person77.sex='F' AND jump.personID = person77.UniqueID")
+CMJlM <- dbGetQuery(con, "SELECT jump.tv AS TF, jump.weight AS Weight FROM jump, person77 WHERE (jump.type='CMJ' OR jump.type='CMJl') AND person77.sex='M' AND jump.personID = person77.UniqueID")
+CMJlF <- dbGetQuery(con, "SELECT jump.tv AS TF, jump.weight AS Weight FROM jump, person77 WHERE (jump.type='CMJ' OR jump.type='CMJl') AND person77.sex='F' AND jump.personID = person77.UniqueID")
+
+par(new=FALSE, oma=c(1,1,5,1))
+par(mfcol=c(2,2))
+
+a=SJlM$TF
+b=as.double(SJlM$Weight)
+plot(a~b, main="SJ Man", xlab="Extra weight (%)", ylab="Flight time (s)")
+abline(lm(a~b),col='red')
+stat=paste("Pearson=",round(cor(a,b),3)," R²=",round(cor(a,b)^2,3))
+mtext(stat, cex=.7)
+
+a=CMJlM$TF
+b=as.double(CMJlM$Weight)
+plot(a~b, main="CMJ Man", xlab="Extra weight (%)", ylab="Flight time (s)")
+abline(lm(a~b),col='red')
+stat=paste("Pearson=",round(cor(a,b),3)," R²=",round(cor(a,b)^2,3))
+mtext(stat, cex=.7)
+
+a=SJlF$TF
+b=as.double(SJlF$Weight)
+plot(a~b, main="SJ Woman", xlab="Extra weight (%)", ylab="Flight time (s)")
+abline(lm(a~b),col='red')
+stat=paste("Pearson=",round(cor(a,b),3)," R²=",round(cor(a,b)^2,3))
+mtext(stat, cex=.7)
+
+a=CMJlF$TF
+b=as.double(CMJlF$Weight)
+if(length(a)>0) {
+        plot(a~b, main="CMJ Woman", xlab="Extra weight (%)", ylab="Flight time (s)")
+        if(max(b)>0) {
+                abline(lm(a~b),col='red')
+                stat=paste("Pearson=",round(cor(a,b),3)," R²=",round(cor(a,b)^2,3))
+                mtext(stat, cex=.7)
+        }
+}
+
+par(def.par)#- reset to default
+
+par(new=TRUE)
+plot(-1,type="n",axes=F,xlab='',ylab='')
+title(main="Correlations between extra weight in % and Flight time",
+  sub=paste(Sys.Date(),"(YYYY-MM-DD)"), cex.sub = 0.75, font.sub = 3, col.sub = "red")
+
+dev.off()
+
diff --git a/chronojump_server/r-sqlite/heights_by_jumps_boxplot.R b/chronojump_server/r-sqlite/tf_by_jumps_boxplot.R
similarity index 85%
rename from chronojump_server/r-sqlite/heights_by_jumps_boxplot.R
rename to chronojump_server/r-sqlite/tf_by_jumps_boxplot.R
index 92c7171..aa67cd4 100644
--- a/chronojump_server/r-sqlite/heights_by_jumps_boxplot.R
+++ b/chronojump_server/r-sqlite/tf_by_jumps_boxplot.R
@@ -1,5 +1,5 @@
 library(GDD)
-GDD(file="/var/www/web/server/images/heights_by_jumps_boxplot.png", 
+GDD(file="/var/www/web/server/images/tf_by_jumps_boxplot.png", 
   width = 670, height= 670, ps = 12, type="png")
 library(RSQLite)
 drv <- dbDriver("SQLite")
@@ -15,12 +15,12 @@ par(mfrow=c(2,1))
 ntypes <- length(levels(as.factor (jumpsM$type)))
 bp=boxplot(jumpsM$tv ~ jumpsM$type, las=2, col=terrain.colors(ntypes))
 text(1:ntypes, .4, paste("n=",format(bp$n),sep=""), xpd = TRUE, col = "grey20", cex=0.8)
-title(main="Heights by jumps in males")
+title(main="Flight times by jumps in males")
 
 ntypes <- length(levels(as.factor (jumpsF$type)))
 bp=boxplot(jumpsF$tv ~ jumpsF$type, las=2, col=topo.colors(ntypes))
 text(1:ntypes, .4, paste("n=",format(bp$n),sep=""), xpd = TRUE, col = "grey20", cex=0.8)
-title(main="Heights by jumps in females",
+title(main="Flight times by jumps in females",
   sub=paste(Sys.Date(),"(YYYY-MM-DD)"), cex.sub = 0.75, font.sub = 3, col.sub = "red")
 
 par(mfrow=c(1,1))
diff --git a/chronojump_server/r-sqlite/tv_by_level_sex_jumptype.R b/chronojump_server/r-sqlite/tf_by_level_sex_jumptype.R
similarity index 85%
rename from chronojump_server/r-sqlite/tv_by_level_sex_jumptype.R
rename to chronojump_server/r-sqlite/tf_by_level_sex_jumptype.R
index e79f8c6..64ffe24 100644
--- a/chronojump_server/r-sqlite/tv_by_level_sex_jumptype.R
+++ b/chronojump_server/r-sqlite/tf_by_level_sex_jumptype.R
@@ -1,5 +1,5 @@
 library(GDD)
-GDD(file="/var/www/web/server/images/tv_by_level_sex_jumptype.png", type="png", w=670, h=670)
+GDD(file="/var/www/web/server/images/tf_by_level_sex_jumptype.png", type="png", w=670, h=670)
 library(RSQLite)
 drv = dbDriver("SQLite")
 file = "/root/.local/share/Chronojump/database/chronojump_server.db"
@@ -24,12 +24,12 @@ jumps$sexNum <- recode(jumps$sexF, '"M" = .1; "F" = -.1; ',
      scales=list(x=list(tick.number=3, relation='same'), 
      y=list(relation='same')),
      xlab="level",
+     ylab="tf",
      pch=19, col=cols,
      auto.key=list(border=FALSE, text=c("Males", "Females"), col=cols, points = FALSE),
-       #title="TV by level, sex and jump type", sub="hola"),
-       main="TV by level, sex and jump type", 
+       main="TF by level, sex and jump type", 
         sub=paste(Sys.Date(),"(YYYY-MM-DD)"), cex.sub = 0.75, font.sub = 3, col.sub = "red",
-     #key=list(title(main="TV by level, sex and jump type", 
+     #key=list(title(main="TF by level, sex and jump type", 
      #   sub=paste(Sys.Date(),"(YYYY-MM-DD)"), cex.sub = 0.75, font.sub = 3, col.sub = "red")),
      data=jumps)
      
diff --git a/chronojump_server/r-sqlite/update-r-graphs b/chronojump_server/r-sqlite/update-r-graphs
old mode 100644
new mode 100755
index 83cb30c..d3199cf
--- a/chronojump_server/r-sqlite/update-r-graphs
+++ b/chronojump_server/r-sqlite/update-r-graphs
@@ -1,21 +1,26 @@
 if [ -f /var/www/mono/need-to-update-r-graphs ]
 then
-  R CMD BATCH heights_by_jumps_boxplot.R
+  R CMD BATCH evaluators.R
 sleep 5
   R CMD BATCH persons.R
 sleep 5
-  R CMD BATCH tv_by_level_sex_jumptype.R
+  R CMD BATCH tf_by_jumps_boxplot.R
 sleep 5
-  R CMD BATCH evaluators.R
+  R CMD BATCH tf_by_extra_weight.R
+sleep 5
+  R CMD BATCH ieiub.R
+sleep 5
+  R CMD BATCH tf_by_level_sex_jumptype.R
 
 sleep 5
 cd /var/www/web/server/images
-convert -resize 225x225 heights_by_jumps_boxplot.png small/heights_by_jumps_boxplot.png
-convert -resize 225x225 persons.png small/persons.png
-convert -resize 225x225 tv_by_level_sex_jumptype.png small/tv_by_level_sex_jumptype.png
 convert -resize 225x225 evaluators.png small/evaluators.png
+convert -resize 225x225 persons.png small/persons.png
+convert -resize 225x225 tf_by_jumps_boxplot.png small/tf_by_jumps_boxplot.png
+convert -resize 225x225 tf_by_extra_weight.png small/tf_by_extra_weight.png
+convert -resize 225x225 ieiub.png small/ieiub.png
+convert -resize 225x225 tf_by_level_sex_jumptype.png small/tf_by_level_sex_jumptype.png
 
 rm /var/www/mono/need-to-update-r-graphs
 fi
 
-
diff --git a/diagrams/classes/sqlite.dia b/diagrams/classes/sqlite.dia
index bd03fc7..4513cab 100644
Binary files a/diagrams/classes/sqlite.dia and b/diagrams/classes/sqlite.dia differ
diff --git a/web/server.html b/web/server.html
index 84f39e5..853e169 100644
--- a/web/server.html
+++ b/web/server.html
@@ -48,18 +48,31 @@
 			<div id="slides">
 				<div id="slide1">
 					<ul>
-						<li><a href="#photo1"><img src="server/images/small/persons.png" alt="Chronojump Server"></a></li>
-						<li><a href="#photo2"><img src="server/images/small/heights_by_jumps_boxplot.png" alt="Chronojump Server"></a></li>
-						<li><a href="#photo3"><img src="server/images/small/tv_by_level_sex_jumptype.png" alt="Chronojump Server"></a></li>
-						<li><a href="#photo4"><img src="server/images/small/evaluators.png" alt="Chronojump Server"></a></li>
+						<li><a href="#evaluators">Evaluators</a></li>
+						<li><a href="#persons">Persons</a></li>
+						<li><a href="#tests">Tests</a></li>
 					</ul>
 				</div>
 			</div>
 
 			<div id="fullsize">
-				<div id="photo1">
-					<table border="0">
-						<tr><th colspan="2"><h3>Chronojump Server</h3></th></tr>
+				<div id="evaluators">
+					<table id="server" border="0">
+						<tr><th colspan="2"><h3>Chronojump Server - Evaluators stats</h3></th></tr>
+						<tr><td colspan="2" bgcolor="#6c77ab" height="1px"></td></tr>
+						<tr valign="top"><td rowspan="2">
+								<img src="server/images/small/evaluators.png" alt="Chronojump Server">
+								</td><td width="100%">
+								In this graph you can see the different contributors that have uploaded data in the server. Each contributor has two bars, one with the number of jumps uploaded, and other with number of persons uploaded.
+								</td></tr>
+								<tr><td valign="bottom">
+										<a href="server/images/evaluators.png"><img src="images/zoom.png" alt="Zoom image" border="0"></a>
+							</td>
+					</tr></table>
+				</div>
+				<div id="persons">
+					<table id="server" border="0">
+						<tr><th colspan="2"><h3>Chronojump Server - Persons stats</h3></th></tr>
 						<tr><td colspan="2" bgcolor="#6c77ab" height="1px"></td></tr>
 						<tr valign="top"><td rowspan="2">
 								<img src="server/images/small/persons.png" alt="Chronojump Server">
@@ -68,7 +81,8 @@
 								<ul>
 									<li>Sport
 									<li>Country
-									<li>Sex
+									<li>Age
+									<li>Gender
 									<li>Level (of practice)
 								</ul>
 								</td></tr>
@@ -77,29 +91,58 @@
 							</td>
 					</tr></table>
 				</div>
-				<div id="photo2">
-					<table border="0">
-						<tr><th colspan="2"><h3>Chronojump Server</h3></th></tr>
-						<tr><td colspan="2" bgcolor="#6c77ab" height="1px"></td></tr>
-						<tr valign="top"><td rowspan="2">
-								<img src="server/images/small/heights_by_jumps_boxplot.png" alt="Chronojump Server">
-								</td><td width="100%">
+				<div id="tests">
+					<table id="server" border="0">
+						<tr><th colspan="3"><h3>Chronojump Server - Tests stats</h3></th></tr>
+						<tr><td colspan="3" bgcolor="#6c77ab" height="1px"></td></tr>
+						<tr>
+							<td><a href="#tests"><img src="server/images/small/tf_by_jumps_boxplot.png" width="60" height="60"></a></td>
+							<td><a href="#tests2"><img src="server/images/small/tf_by_extra_weight.png" width="60" height="60"></a></td>
+							<td><a href="#tests3"><img src="server/images/small/tf_by_level_sex_jumptype.png" width="60" height="60"></a></td>
+						</tr>
+						<tr valign="top"><td colspan="2" rowspan="2">
+								<img src="server/images/small/tf_by_jumps_boxplot.png" width="140" height="140">
+						</td><td width="100%">
 								This image shows a graph for males and another for females. Each graph plots boxplots of different simple jumps (only on flight time) that are on server.
 								<br><br>Each boxplot shows quantiles and rare values (if any).
 								<br>Also <i>n</i> value is shown.
 								</td></tr>
 								<tr><td valign="bottom">
-										<a href="server/images/heights_by_jumps_boxplot.png"><img src="images/zoom.png" alt="Zoom image" border="0"></a>
+										<a href="server/images/tf_by_jumps_boxplot.png"><img src="images/zoom.png" alt="Zoom image" border="0"></a>
 							</td>
 					</tr></table>
 				</div>
-				<div id="photo3">
-					<table border="0">
-						<tr><th colspan="2"><h3>Chronojump Server</h3></th></tr>
-						<tr><td colspan="2" bgcolor="#6c77ab" height="1px"></td></tr>
-						<tr valign="top"><td rowspan="2">
-								<img src="server/images/small/tv_by_level_sex_jumptype.png" alt="Chronojump Server">
-								</td><td width="100%">
+				<div id="tests2">
+					<table id="server" border="0">
+						<tr><th colspan="3"><h3>Chronojump Server - Tests stats</h3></th></tr>
+						<tr><td colspan="3" bgcolor="#6c77ab" height="1px"></td></tr>
+						<tr>
+							<td><a href="#tests"><img src="server/images/small/tf_by_jumps_boxplot.png" width="60" height="60"></a></td>
+							<td><a href="#tests2"><img src="server/images/small/tf_by_extra_weight.png" width="60" height="60"></a></td>
+							<td><a href="#tests3"><img src="server/images/small/tf_by_level_sex_jumptype.png" width="60" height="60"></a></td>
+						</tr>
+						<tr valign="top"><td colspan="2" rowspan="2">
+								<img src="server/images/small/tf_by_extra_weight.png" width="140" height="140">
+						</td><td width="100%">
+								This image shows correlation between jumps flight time and extra weight.
+								</td></tr>
+								<tr><td valign="bottom">
+										<a href="server/images/tf_by_extra_weight.png"><img src="images/zoom.png" alt="Zoom image" border="0"></a>
+							</td>
+					</tr></table>
+				</div>
+				<div id="tests3">
+					<table id="server" border="0">
+						<tr><th colspan="3"><h3>Chronojump Server - Tests stats</h3></th></tr>
+						<tr><td colspan="3" bgcolor="#6c77ab" height="1px"></td></tr>
+						<tr>
+							<td><a href="#tests"><img src="server/images/small/tf_by_jumps_boxplot.png" width="60" height="60"></a></td>
+							<td><a href="#tests2"><img src="server/images/small/tf_by_extra_weight.png" width="60" height="60"></a></td>
+							<td><a href="#tests3"><img src="server/images/small/tf_by_level_sex_jumptype.png" width="60" height="60"></a></td>
+						</tr>
+						<tr valign="top"><td colspan="2" rowspan="2">
+								<img src="server/images/small/tf_by_level_sex_jumptype.png" width="140" height="140">
+						</td><td width="100%">
 								This is a four variable graph:
 								<ul>
 									<li>Height of jump
@@ -109,22 +152,50 @@
 								</ul>
 								</td></tr>
 								<tr><td valign="bottom">
-										<a href="server/images/tv_by_level_sex_jumptype.png"><img src="images/zoom.png" alt="Zoom image" border="0"></a>
+										<a href="server/images/tf_by_level_sex_jumptype.png"><img src="images/zoom.png" alt="Zoom image" border="0"></a>
 							</td>
 					</tr></table>
 				</div>
-				<div id="photo4">
-					<table border="0">
-						<tr><th colspan="2"><h3>Chronojump Server</h3></th></tr>
+				<div id="reliability">
+					<table id="all_vert_space">
+						<tr><th colspan="2"><h3>Reliability on the server. Two levels:</h3></th></tr>
 						<tr><td colspan="2" bgcolor="#6c77ab" height="1px"></td></tr>
-						<tr valign="top"><td rowspan="2">
-								<img src="server/images/small/evaluators.png" alt="Chronojump Server">
-								</td><td width="100%">
-								In this graph you can see the different contributors that have uploaded data in the server. Each contributor has two bars, one with the number of jumps uploaded, and other with number of persons uploaded.
+
+						<tr valign="top"><td colspan="2">
+<b>1)<span style="background-color: yellow">General data</b></span> Uploaded by anyone with the technology.
+<br><b>2)<span style="background-color: #ccff00">Reliable data</b></span> Accredited by SAFE research group (Universitat Ramon Llull).
+								</td></tr>
+<tr valign="top"><td width="50%">
+<span style="background-color: #ccff00"><b>Reliable data</b></span>. Profile <b>Evaluator-trainer</b>
+<ul id="nospace">
+  <li>National trainer.
+  <li>Current work: club, institution, category.
+  <li>Years as elite trainer.
+  <li>Historical on trained sports and specialties.
+  <li>Experience on using measurement equipment.
+  <li>Career (100 words)
+</ul>
+</td><td>
+<span style="background-color: #ccff00"><b>Reliable data</b></span>. Profile <b>Evaluator-researcher</b>
+<ul id="nospace">
+  <li>Maximum reached degree.
+  <li>Teacher at University?
+  <li>Sport science researches using measure.
+  <li>Other researches. Years as researcher.
+  <li>University research groups.
+  <li>Received grants.
+  <li>Career (100 words)
+</ul>
+								</td></tr>
+						<tr valign="top"><td colspan="2">
+<span style="background-color: #ccff00"><b>Reliable data</b></span>. Criteria <b>by session</b>: 
+Informed consent -
+Warming up -
+Protocol variations (if any) -
+New tests protocols and validations (if any) -
+Data has been published? Where? -
+Justification of the research (100 words).
 								</td></tr>
-								<tr><td valign="bottom">
-										<a href="server/images/evaluators.png"><img src="images/zoom.png" alt="Zoom image" border="0"></a>
-							</td>
 					</tr></table>
 				</div>
 			</div>
@@ -132,7 +203,7 @@
 				<font size="2">
 					<br>Chronojump has a server in order to share data between users.
 					<br>Server started to collect and show data (thanks to users contribution).
-					<br>All the graphs are updated nightly if there's new data.
+					<br><br><a href="server.html#reliability">Realiability on the server</a>.
 				</font>
 			</div>
 		</div>
diff --git a/web/server_es.html b/web/server_es.html
index bf4eaf5..68ca49b 100644
--- a/web/server_es.html
+++ b/web/server_es.html
@@ -48,18 +48,31 @@
 			<div id="slides">
 				<div id="slide1">
 					<ul>
-						<li><a href="#photo1"><img src="server/images/small/persons.png" alt="Chronojump Server"></a></li>
-						<li><a href="#photo2"><img src="server/images/small/heights_by_jumps_boxplot.png" alt="Chronojump Server"></a></li>
-						<li><a href="#photo3"><img src="server/images/small/tv_by_level_sex_jumptype.png" alt="Chronojump Server"></a></li>
-						<li><a href="#photo4"><img src="server/images/small/evaluators.png" alt="Chronojump Server"></a></li>
+						<li><a href="#evaluators">Evaluadores</a></li>
+						<li><a href="#persons">Personas</a></li>
+						<li><a href="#tests">Tests</a></li>
 					</ul>
 				</div>
 			</div>
 
 			<div id="fullsize">
-				<div id="photo1">
-					<table border="0">
-						<tr><th colspan="2"><h3>Chronojump Server</h3></th></tr>
+				<div id="evaluators">
+					<table id="server" border="0">
+						<tr><th colspan="2"><h3>Chronojump Server - Evaluators stats</h3></th></tr>
+						<tr><td colspan="2" bgcolor="#6c77ab" height="1px"></td></tr>
+						<tr valign="top"><td rowspan="2">
+								<img src="server/images/small/evaluators.png" alt="Chronojump Server">
+								</td><td width="100%">
+								En este gráfico puede ver los diferentes evaluadores que han subido sus contribuciones. Cada evaluador dispone de dos barras, una para el número de saltos subidos y otra para el numero de sujetos añadidos.
+								</td></tr>
+								<tr><td valign="bottom">
+										<a href="server/images/evaluators.png"><img src="images/zoom.png" alt="Zoom image" border="0"></a>
+							</td>
+					</tr></table>
+				</div>
+				<div id="persons">
+					<table id="server" border="0">
+						<tr><th colspan="2"><h3>Chronojump Server - Persons stats</h3></th></tr>
 						<tr><td colspan="2" bgcolor="#6c77ab" height="1px"></td></tr>
 						<tr valign="top"><td rowspan="2">
 								<img src="server/images/small/persons.png" alt="Chronojump Server">
@@ -68,38 +81,68 @@
 								<ul>
 									<li>Deporte
 									<li>País
+									<li>Edad
 									<li>Género
 									<li>Nivel (de práctica)
 								</ul>
 								</td></tr>
 								<tr><td valign="bottom">
-										<a href="server/images/persons.png"><img src="images/zoom.png" alt="Ampliar imagen" border="0"></a>
+										<a href="server/images/persons.png"><img src="images/zoom.png" alt="Zoom image" border="0"></a>
 							</td>
 					</tr></table>
 				</div>
-				<div id="photo2">
-					<table border="0">
-						<tr><th colspan="2"><h3>Chronojump Server</h3></th></tr>
-						<tr><td colspan="2" bgcolor="#6c77ab" height="1px"></td></tr>
-						<tr valign="top"><td rowspan="2">
-								<img src="server/images/small/heights_by_jumps_boxplot.png" alt="Chronojump Server">
-								</td><td width="100%">
+				<div id="tests">
+					<table id="server" border="0">
+						<tr><th colspan="3"><h3>Chronojump Server - Tests stats</h3></th></tr>
+						<tr><td colspan="3" bgcolor="#6c77ab" height="1px"></td></tr>
+						<tr>
+							<td><a href="#tests"><img src="server/images/small/tf_by_jumps_boxplot.png" width="60" height="60"></a></td>
+							<td><a href="#tests2"><img src="server/images/small/tf_by_extra_weight.png" width="60" height="60"></a></td>
+							<td><a href="#tests3"><img src="server/images/small/tf_by_level_sex_jumptype.png" width="60" height="60"></a></td>
+						</tr>
+						<tr valign="top"><td colspan="2" rowspan="2">
+								<img src="server/images/small/tf_by_jumps_boxplot.png" width="140" height="140">
+						</td><td width="100%">
 								En esta imagen puede ver un gráfico para hombres y otro para mujeres. Cada gráfico muestra cajas de saltos simples (con sólo un tiempo de vuelo) que han sido subidos al servidor.
 								<br><br>Cada caja muestra los cuartiles y los valores extraños (si los hay).
 								<br>También se muestra la <i>n</i>.
 								</td></tr>
 								<tr><td valign="bottom">
-										<a href="server/images/heights_by_jumps_boxplot.png"><img src="images/zoom.png" alt="Ampliar imagen" border="0"></a>
+										<a href="server/images/tf_by_jumps_boxplot.png"><img src="images/zoom.png" alt="Zoom image" border="0"></a>
 							</td>
 					</tr></table>
 				</div>
-				<div id="photo3">
-					<table border="0">
-						<tr><th colspan="2"><h3>Chronojump Server</h3></th></tr>
-						<tr><td colspan="2" bgcolor="#6c77ab" height="1px"></td></tr>
-						<tr valign="top"><td rowspan="2">
-								<img src="server/images/small/tv_by_level_sex_jumptype.png" alt="Chronojump Server">
-								</td><td width="100%">
+				<div id="tests2">
+					<table id="server" border="0">
+						<tr><th colspan="3"><h3>Chronojump Server - Tests stats</h3></th></tr>
+						<tr><td colspan="3" bgcolor="#6c77ab" height="1px"></td></tr>
+						<tr>
+							<td><a href="#tests"><img src="server/images/small/tf_by_jumps_boxplot.png" width="60" height="60"></a></td>
+							<td><a href="#tests2"><img src="server/images/small/tf_by_extra_weight.png" width="60" height="60"></a></td>
+							<td><a href="#tests3"><img src="server/images/small/tf_by_level_sex_jumptype.png" width="60" height="60"></a></td>
+						</tr>
+						<tr valign="top"><td colspan="2" rowspan="2">
+								<img src="server/images/small/tf_by_extra_weight.png" width="140" height="140">
+						</td><td width="100%">
+								Esta imagen muestra la correlación entre tiempo de vuelo y peso extra.
+								</td></tr>
+								<tr><td valign="bottom">
+										<a href="server/images/tf_by_extra_weight.png"><img src="images/zoom.png" alt="Zoom image" border="0"></a>
+							</td>
+					</tr></table>
+				</div>
+				<div id="tests3">
+					<table id="server" border="0">
+						<tr><th colspan="3"><h3>Chronojump Server - Tests stats</h3></th></tr>
+						<tr><td colspan="3" bgcolor="#6c77ab" height="1px"></td></tr>
+						<tr>
+							<td><a href="#tests"><img src="server/images/small/tf_by_jumps_boxplot.png" width="60" height="60"></a></td>
+							<td><a href="#tests2"><img src="server/images/small/tf_by_extra_weight.png" width="60" height="60"></a></td>
+							<td><a href="#tests3"><img src="server/images/small/tf_by_level_sex_jumptype.png" width="60" height="60"></a></td>
+						</tr>
+						<tr valign="top"><td colspan="2" rowspan="2">
+								<img src="server/images/small/tf_by_level_sex_jumptype.png" width="140" height="140">
+						</td><td width="100%">
 								Este es un gráfico de cuatro variables:
 								<ul>
 									<li>Altura del salto
@@ -109,30 +152,57 @@
 								</ul>
 								</td></tr>
 								<tr><td valign="bottom">
-										<a href="server/images/tv_by_level_sex_jumptype.png"><img src="images/zoom.png" alt="Ampliar imagen" border="0"></a>
+										<a href="server/images/tf_by_level_sex_jumptype.png"><img src="images/zoom.png" alt="Zoom image" border="0"></a>
 							</td>
 					</tr></table>
 				</div>
-				<div id="photo4">
-					<table border="0">
-						<tr><th colspan="2"><h3>Chronojump Server</h3></th></tr>
+				<div id="reliability">
+					<table id="all_vert_space">
+						<tr><th colspan="2"><h3>Fiabilidad en el servidor. Dos niveles:</h3></th></tr>
 						<tr><td colspan="2" bgcolor="#6c77ab" height="1px"></td></tr>
-						<tr valign="top"><td rowspan="2">
-								<img src="server/images/small/evaluators.png" alt="Chronojump Server">
-								</td><td width="100%">
-								En este gráfico puede ver los diferentes evaluadores que han subido sus contribuciones. Cada evaluador dispone de dos barras, una para el número de saltos subidos y otra para el numero de sujetos añadidos.
+
+						<tr valign="top"><td colspan="2">
+<b>1)<span style="background-color: yellow">Datos generales</b></span> Los <i>sube</i> cualquiera que disponga de la tecnología.
+<br><b>2)<span style="background-color: #ccff00">Datos fiables</b></span> Acreditados por el grupo de investigación SAFE (Universitat Ramon Llull).
+								</td></tr>
+<tr valign="top"><td width="50%">
+<span style="background-color: #ccff00"><b>Datos fiables</b></span>. Perfil <b>Evaluador-entrenador</b>
+<ul id="nospace">
+  <li>Titulación de entrenador nacional.
+  <li>Trabajo actual: club, institución, categoría.
+  <li>Años de entrenador en élite.
+  <li>Historial de entrenador: deportes y modalidades.
+  <li>Experiencia en utilización de instrumentos de medida.
+  <li>Trayectoria profesional (100 palabras).
+</ul>
+</td><td>
+<span style="background-color: #ccff00"><b>Datos fiables</b></span>. Perfil <b>Evaluador-investigador</b>
+<ul id="nospace">
+  <li>Titulación conseguida. ¿Es profesor universitario?
+  <li>Investigaciones en ciencias del deporte usando la medida.
+  <li>Otras investigaciones. Años de investigador.
+  <li>Grupos de investigación universitarios.
+  <li>Becas obtenidas.
+  <li>Trayectoria profesional (100 palabras).
+</ul>
+								</td></tr>
+						<tr valign="top"><td colspan="2">
+<span style="background-color: #ccff00"><b>Datos fiables</b></span>. Criterios <b>por sesión</b>: 
+Consentimiento informado -
+Calentamiento -
+Variaciones del protocolo (si las hay) -
+Protocolos de nuevos tests y validaciones (si los hay) -
+Los datos han sido publicados? Dónde? -
+Justificación de la investigación (100 palabras).
 								</td></tr>
-								<tr><td valign="bottom">
-										<a href="server/images/evaluators.png"><img src="images/zoom.png" alt="Ampliar imagen" border="0"></a>
-							</td>
 					</tr></table>
 				</div>
 			</div>
 			<div id="note">
 				<font size="2">
 					<br>Chronojump dispone de un servidor para compartir datos entre usuarios.
-					<br>El servidor ya ha comenzado a recoger y mostrar datos gracias a las aportaciones de los usuarios.
-					<br>Si hay nuevos datos, los gráficos se actualizan por la noche.
+					<br>El servidor recoger y muestra datos aportados por los usuarios.
+					<br><br><a href="server_es.html#reliability">Fiabilidad en el servidor</a>.
 				</font>
 			</div>
 		</div>
diff --git a/web/style.css b/web/style.css
index 54feff0..2597805 100644
--- a/web/style.css
+++ b/web/style.css
@@ -453,3 +453,4 @@ http://www.cssplay.co.uk/menu/double-click-gallery-vertical.html
 #gallery #noteStore {position:relative; top:0; height:150px; overflow:hidden; padding-top:315px; padding-left:125px; text-align:left;}
 #gallery #noteStore table{padding: 0px 0px 0px 0px;float: left;}
 #gallery #noteStore td {padding: 0px 0px 0px 0px; width:315px;}
+#gallery #fullsize div table#server {padding:0; margin:20px 125px; font-size:12px; line-height:18px; width:675px; height:250px;}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]