Difference between revisions of "Team:Waterloo/Notebook"

Revision as of 16:52, 31 October 2017 (view source)

Latest revision as of 22:50, 1 November 2017 (view source)

(2 intermediate revisions by the same user not shown)

Line 28:

<li class="active dropdown nav-item"><a href="#" class="nav-link dropdown-toggle nav-link" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Project<span class="caret"></span></a>

+

<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Contribution"><span>Contribution</span></a></li>

+

</li>

<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Description"><span>Description</span></a></li>

</li>

Line 53:

Line 55:

<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Human_Practices"><span>Human Practices</span></a></li>

</li>

−

<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/HP-Silver"><span>Silver</span></a></li>

+

<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/HP/Silver"><span>Silver</span></a></li>

</li>

−

+

</li>

<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Integrated_Practices"><span>Integrated Practices</span></a></li>

Line 66:

Line 68:

<li class="dropdown nav-item"><a href="#" class="nav-link dropdown-toggle nav-link" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Awards<span class="caret"></span></a>

−

~~<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Entrepreneurship"><span>Entrepreneurship</span></a></li>~~

−

~~</li>~~

−

~~<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Hardware"><span>Hardware</span></a></li>~~

−

~~</li>~~

<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Software"><span>Software</span></a></li>

−

~~</li>~~

−

~~<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Measurement"><span>Measurement</span></a></li>~~

</li>

<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Model"><span>Model</span></a></li>

Line 101:

Line 97:

<br>

−

+

+

<p style="text-align:center;">Click on a day to view the work.</p>

+

+

var month = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];

+

var cal = new CalHeatMap();

+

cal.init({

+

start: new Date(2017, 4),

+

data:days,

+

dataType: "json",

+

domain : "month",

+

subDomain : "day",

+

range : 6,

+

cellSize: 24,

+

subDomainTextFormat: "%d",

+

displayLegend: false,

+

onClick: function(date, nb) {

+

$("#onClick-placeholder").html(date.toDateString());

+

var message = ""

+

var key = month[date.getMonth()]+(date.getDate())

+

if (key in notes){

+

$.each(notes[key], function( index, value ) {

+

message += "<li>"+value+"<\/li>";

+

});}

+

$("#notes-table").html(message);

+

}

+

});

+

</script>

+

</div>

−

<~~p style~~="~~text~~-~~align:center;~~">~~Click on a day to view the~~

+

−

~~work.~~<~~/p><script type~~="~~text/javascript">~~

+

−

~~var month = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];~~

+

−

~~var cal = new CalHeatMap();~~

+

−

~~cal.init({~~

+

−

~~start: new Date(2016, 4),~~

+

−

~~data:days,~~

+

−

~~dataType: "json",~~

+

−

~~domain : "month",~~

+

−

~~subDomain : "day",~~

+

−

~~range : 6,~~

+

−

~~cellSize: 24,~~

+

−

~~subDomainTextFormat: "%d",~~

+

−

~~displayLegend: false,~~

+

−

~~onClick: function(date, nb) {~~

+

−

~~$("#~~onClick-placeholder"~~).html(date.toDateString());~~

+

−

~~var message = ""~~

+

−

~~var key = month[date.getMonth()]+(date.getDate())~~

+

−

~~if (key in notes){~~

+

−

~~$.each(notes[key], function( index, value ) {~~

+

−

~~message += "<li~~>~~"+value+"~~<\/li>";

+

−

~~});}~~

+

−

$("#notes-table"~~).html(message);~~

+

−

}

+

−

~~});~~

+

−

</~~script~~>

+

</div>

@@ Line 28: / Line 28: @@
 <li class="active dropdown nav-item"><a href="#" class="nav-link dropdown-toggle nav-link" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Project<span class="caret"></span></a>
 <ul class="dropdown-menu">
+<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Contribution"><span>Contribution</span></a></li>
+</li>
 <li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Description"><span>Description</span></a></li>
 </li>
@@ Line 53: / Line 55: @@
 <li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Human_Practices"><span>Human Practices</span></a></li>
 </li>
-<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/HP-Silver"><span>Silver</span></a></li>
+<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/HP/Silver"><span>Silver</span></a></li>
 </li>
-<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/HP-Gold"><span>Gold</span></a></li>
+<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/HP/Gold_Integrated"><span>Gold</span></a></li>
 </li>
 <li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Integrated_Practices"><span>Integrated Practices</span></a></li>
@@ Line 66: / Line 68: @@
 <li class="dropdown nav-item"><a href="#" class="nav-link dropdown-toggle nav-link" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Awards<span class="caret"></span></a>
 <ul class="dropdown-menu">
-<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Entrepreneurship"><span>Entrepreneurship</span></a></li>
-</li>
-<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Hardware"><span>Hardware</span></a></li>
-</li>
 <li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Software"><span>Software</span></a></li>
-</li>
-<li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Measurement"><span>Measurement</span></a></li>
 </li>
 <li class=""><a class="dropdown-item" href="https://2017.igem.org/Team:Waterloo/Model"><span>Model</span></a></li>
@@ Line 101: / Line 97: @@
 <br>
 <br>
-        <div id="cal-heatmap"></div>
+  <div id="cal-heatmap"></div>
+    <p style="text-align:center;">Click on a day to view the work.</p>
+    <script type="text/javascript">
+      var month = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+      var cal = new CalHeatMap();
+      cal.init({
+              start: new Date(2017, 4),
+          data:days,
+          dataType: "json",
+          domain : "month",
+          subDomain : "day",
+          range : 6,
+          cellSize: 24,
+              subDomainTextFormat: "%d",
+              displayLegend: false,
+              onClick: function(date, nb) {
+              $("#onClick-placeholder").html(date.toDateString());
+              var message = ""
+              var key = month[date.getMonth()]+(date.getDate())
+              if (key in notes){
+              $.each(notes[key], function( index, value ) {
+                      message += "<li>"+value+"<\/li>";
+              });}
+              $("#notes-table").html(message);
+      }
+      });
+    </script>
+</div>
-        <p style="text-align:center;">Click on a day to view the
+<div class="content-main">
-        work.</p><script type="text/javascript">
+  <h2 id="onClick-placeholder"></h2>
-	var month = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+  <ul id="notes-table"></ul>
-        var cal = new CalHeatMap();
-        cal.init({
-                start: new Date(2016, 4),
-            data:days,
-            dataType: "json",
-            domain : "month",
-            subDomain : "day",
-            range : 6,
-            cellSize: 24,
-                subDomainTextFormat: "%d",
-                displayLegend: false,
-                onClick: function(date, nb) {
-                $("#onClick-placeholder").html(date.toDateString());
-                var message = ""
-                var key = month[date.getMonth()]+(date.getDate())
-                if (key in notes){
-                $.each(notes[key], function( index, value ) {
-                        message += "<li>"+value+"<\/li>";
-                });}
-                $("#notes-table").html(message);
-        }
-        });
-        </script>
 </div>

Difference between revisions of "Team:Waterloo/Notebook"

Latest revision as of 22:50, 1 November 2017

Notebook

Waterloo iGEM 2017