From: Justin Kruger <20767264@student.uwa.edu.au> Date: Wed, 23 Oct 2013 16:52:04 +0000 (+0800) Subject: Modified data page and added some report stuff X-Git-Url: https://git.ucc.asn.au/?p=matches%2FMCTX3420.git;a=commitdiff_plain;h=14c2cbfcb1556643cb3fe2d8ee79736555b81219 Modified data page and added some report stuff --- diff --git a/reports/final/teamwork - justin.docx b/reports/final/teamwork - justin.docx new file mode 100644 index 0000000..a27d002 Binary files /dev/null and b/reports/final/teamwork - justin.docx differ 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;