From 14c2cbfcb1556643cb3fe2d8ee79736555b81219 Mon Sep 17 00:00:00 2001 From: Justin Kruger <20767264@student.uwa.edu.au> Date: Thu, 24 Oct 2013 00:52:04 +0800 Subject: [PATCH] Modified data page and added some report stuff --- reports/final/teamwork - justin.docx | Bin 0 -> 22627 bytes testing/MCTXWeb/public_html/data.html | 188 +++++-------------- testing/MCTXWeb/public_html/static/style.css | 11 ++ 3 files changed, 54 insertions(+), 145 deletions(-) create mode 100644 reports/final/teamwork - justin.docx diff --git a/reports/final/teamwork - justin.docx b/reports/final/teamwork - justin.docx new file mode 100644 index 0000000000000000000000000000000000000000..a27d002dc9b300bcf6465d4445cdc0853e91921d GIT binary patch literal 22627 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

?K$PG+cs0dZhYPMGIs_A_Bokw+cX1l|l zudPeOrFM4%EVZtLDE2^a08^tiCv&TRukWz%&~iAYoF|9al-_FRK)83kB3{cU(Y39A z{HwVQ=D@(PnJyu0?hmB`RL)&`CQ*f>hqjIefv5 ztJo0Zn%IDTUkvICARz*A5gsZzXFJIDr8Syc1$fkSrz`Hf$KA5bw^FO!bEM9oyjW3F z$y&t*0vlw-erJ;l-yAek)RD>&%hVUnQ)Dj#{>W<2aRRA?^u+t>-yQVL^5zv@?(ZE2 zo4I}pR6D-`eo3@NH$=-U9_HEJuzWSzdskY+n!y00iX2gs6kN$SN~TwW7F1i#7}q^- zb?7gViKztJ9}1_(Gc0*U@L!Q_ZKQwWVoQ$Uk-Hi7Z92ew(~`PH?S3XG4gX0y<4>iL z6YgxeOejGrC7%Ow?$=g^O0P^H&P}nmh@Y}6_qn=;eHK!+)Itj&gagXOK z>oU*=8@FjDD3I#l(8FK-s|*g84Pds+UQ4ci(Wf;nmt1XLGQMNDP+YGyQyDA}>R9q1 zKKnw%Si3(7QhHdrk)HZMYH~v>c8j{Tnxe-0VdN z(X7YVRlkXAH1@tLP6}CH(op67R+I1~iR)$;0_0{iA21qi$)Z#%X8RhRl6aqXEPc}P zzRN7SrgLj#)mOlK2(jxJBAabGJO5_pPLVa_C@0{4^BbkhEhPCv2#^~e0Sg?CUvtC7 zH^A+`>~jUF;yz zB)8-&#zHS_I{<@a`{kx7{$Va!7tSJF6YV0(ASI5F3oJxgzSxK>yPDkLr)zTZ1VnC> zajWqR)WE1c%&1vWU;MaAEVVJ*!xNCPRF7u#tp(G|4)mgttN^RfAhYC!X#jOjCQj&!@E|+66fA#^6VDNIYHJThe&Q zCf6$IEuRVz@CM*!6+8oL3lLIll;|?ua_-IdLYX%Y5@v;w35{4T@h;A!&1q z^t>2{FGB~j~=Yrgs6TnF0k4B=H+S%5{U-ss7eP@ORj$SUuFwaP2IBn|8 z=5Vv0PehP&2gkzD_%ZV&Y)uJtJmhr#p{s#AmFeoL2AZhi2ou=!4cDG z;9<^ZJZj{8Uuk4z=4)&XVu|=XU@PjSXhcqRp|d$V2QSE`@)oxJ$kGD+q!)Xxe3`PK zlUej1PgpolO%}91kl?%PlV!kr7ojjp&w^3C+IG=!1S?w9ak|SLs>EiY%mh+5Y&&YN zw;+GBp?N1V?EC9%^bQWalZQV0LOKeB^t)hwF1w^=cY_!vZq{MACZs*$Cm6`MJQ{6V z75&Pw4^IvpXr=9qSX5x!Dr!_Nvl%iHS4qJQs1}%OOGSDvFg?8F{#Pl zaqT>57_YM#$0YNM+&&1%q1a*D1==AV4jXQ`PHo0qH%{KyO%g>GT(dORquE$;Et!LyPT{J1&bsdWWzRJIg#r%b&EJ>j4 z#Q?SBpJL$?rm2YVt(dyUe=Sz|<&x6#-NpN$7JB4u#*UPZ!>utC@ z?S?j}W|3~a!Wv+ilX<>^#kc2Hrmo-6n1ILR{jAF==pS z;Wwe2%+uI4T+B#MY+_Ey{Nv6?dI{{}bSfs#lKTy4KUWog6B9ClH2e3h;TnY8L~0>cAtS#)-h{ z_;IIy6i%x0NOg9&p3$7C*X2RJEt2XB<k zJy|ex!M+En?0g&tdB>%@O;F>EWAr`OWm#h)W$2v0wIimFQ<#LhYS-HDjGQ~{#)>86 za`%$V%vh*rjMlYIGu2Ci=^yb)LG3KDqU+&($h#3tcDYNR^R%~})!pSyN>04@kDGm})Lv)Nbk>OTyUax*KC=ZUT>I7U{5zt3|NT$Q zF9_7p*Ht-M=3;cy{ckUb3>ZPG9Bf?k#jYs6qRuRz0WxK?t(Q&|7vP`|7wtJ;8ybEB@j&cqGMMNu+ON(3wu3Y$ zhPp_KgR!1|_fDJ)0bQO>_WE=kF&2`7bAgY&-F)si{?bPAKp=iwoONd_h^qstA7>5i&{HtCQn;3%72OSF?JsVOl)(L_biV@U0oC^Zv#6tFqBI=a<3a)3 z4F9qpql8lm#rNP7B0u4jvT;fZN^&ALs&WG=D$4aXC3^oFJ>HUc7@*80b<{{fG0N0R^m literal 0 HcmV?d00001 diff --git a/testing/MCTXWeb/public_html/data.html b/testing/MCTXWeb/public_html/data.html index 881f0ae..b17b48f 100644 --- a/testing/MCTXWeb/public_html/data.html +++ b/testing/MCTXWeb/public_html/data.html @@ -22,33 +22,9 @@ $(document).ready(function() { }); }) - - //function to load appropriate graph image depending on drop-down menu - function graphLoad(graphid, folder, newgraph) { - document.getElementById(graphid).src = folder + "/" + newgraph + ".png"; - } - //function to load appropriate graph image depending on drop-down menu - function graphLoad2(graphid, newgraph) { - var exp = document.getElementById("expselect").value; - document.getElementById(graphid).src = exp + "/" + newgraph + ".png"; - } - //function to create appropriate experiment links depending on drop-down menu - function expLoad(expclass, folder, newlink) { - var elems = document.getElementsByClassName(expclass); - for (i = 0; i < elems.length; i++) { - var elem = elems[i]; - elem.href = folder + "/" + newlink; - } - } - //function to update experiment links links depending on drop-down menu - function expLoadTotal(folder) { - expLoad('s1', folder, 'strain1'); - expLoad('s2', folder, 'strain2'); - expLoad('s3', folder, 'strain3'); - expLoad('s4', folder, 'strain4'); - expLoad('p1', folder, 'pressure1'); - expLoad('p2', folder, 'pressure2'); - expLoad('d', folder, 'all.zip'); + //function to load new experiment depending on drop-down menu + function expLoad(expName) { + window.open("api/control?action=load&name=" + expName); } @@ -108,6 +84,12 @@

  • Help
  • + +
    +
    Help
    +

    To view the desired data as a text file, click on the appropriate link. Dilatometer data and camera data can be viewed on their separate pages. To graph the + data, use the graphs page.

    +

    To view data from previous experiments, select the experiment (sorted by date) by using the drop-down menu.

    @@ -115,136 +97,52 @@
    Experiment Data
    - Current Experiment + Select An Experiment +

    - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - -
    View Sensor DataStrain 1Strain 2Strain 3Strain 4Pressure 1Pressure 2
    Experiment DateDate Lookup
    Save Sensor Data
    DilatometerView Data
    Camera DataView Data
    Graphs -
    - -
    - -
    - -

    Previous Experiments

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - + + + - +
    Select Experiment - - - -
    Experiment DateDATE LOOKUP
    View Sensor DataStrain 1Strain 2Strain 3Strain 4Pressure 1Pressure 2
    Save Sensor DataStrain Data
    Pressure Data
    DilatometerView DataDilatometerView Data
    Camera DataView DataCamera DataView Data
    Graphs -
    - -
    -
    Graphs Page
    -
    diff --git a/testing/MCTXWeb/public_html/static/style.css b/testing/MCTXWeb/public_html/static/style.css index f282aba..9e0c551 100644 --- a/testing/MCTXWeb/public_html/static/style.css +++ b/testing/MCTXWeb/public_html/static/style.css @@ -388,6 +388,17 @@ form.controls { font-size:20px; } +/** For links on the data page **/ +.datalink { + color: black; + text-decoration:none; +} + +.datalink:hover { + color: blue; + text-decoration:underline; +} + /** Hack **/ .clear { clear: both; -- 2.20.1