Difference between revisions of "Team:Cambridge-JIC/Notebook"

m (Notebook Entry)
Line 29: Line 29:
 
graph.branch(undefined, 'meta', '#e25b22');
 
graph.branch(undefined, 'meta', '#e25b22');
 
graph.branch('meta', 'evolv', '#e88a27');
 
graph.branch('meta', 'evolv', '#e88a27');
 +
graph.branch('meta', 'enose', '#ef9c2a');
 
graph.branch('meta', 'march', '#f2b130');
 
graph.branch('meta', 'march', '#f2b130');
 
graph.branch('march', 'optics', '#89cace');
 
graph.branch('march', 'optics', '#89cace');
Line 38: Line 39:
 
graph.commit('meta', '29 June 2015', $('<div>In an old office in the Dept. of Plant sciences, the entire team assembled for the first time. The morning consisted of introductions and a chat about the new BioHardware track. Things got much less formal in the afternoon with a quick team-building exercise. Using just plasticine, toothpicks and a plastic cup we were challenged with building as tall a tower as possible to support a set of weights. After a gruelling hour of work we soon realised that no degree could ever prepare anyone for the fickleness of plasticine.</div>'));
 
graph.commit('meta', '29 June 2015', $('<div>In an old office in the Dept. of Plant sciences, the entire team assembled for the first time. The morning consisted of introductions and a chat about the new BioHardware track. Things got much less formal in the afternoon with a quick team-building exercise. Using just plasticine, toothpicks and a plastic cup we were challenged with building as tall a tower as possible to support a set of weights. After a gruelling hour of work we soon realised that no degree could ever prepare anyone for the fickleness of plasticine.</div>'));
 
graph.commit('meta', '3 July 2015', $('<div>After a week of brainstorming and experimenting with our new Arduinos and Raspberry Pis, we had narrowed in on three possible project ideas. In order to get a few different perspectives,  we organised two Q&A sessions with academics carrying out research here in Cambridge. A discussion with Dennis Bray on Bacterial chemotaxis followed by Richard Bowman’s talk  “Lab on the cheap: 3D printed microscope” left us feeling inspired and excited to move forward with our ideas on Monday.</div>'));
 
graph.commit('meta', '3 July 2015', $('<div>After a week of brainstorming and experimenting with our new Arduinos and Raspberry Pis, we had narrowed in on three possible project ideas. In order to get a few different perspectives,  we organised two Q&A sessions with academics carrying out research here in Cambridge. A discussion with Dennis Bray on Bacterial chemotaxis followed by Richard Bowman’s talk  “Lab on the cheap: 3D printed microscope” left us feeling inspired and excited to move forward with our ideas on Monday.</div>'));
 +
graph.commit('enose', 6 July 2015', $('<div></div>'));
 
graph.commit('evolv', '6 July 2015', $('<div>Our first 3D printed part - peristaltic pump. Evolvinator parts ordered. Beginning plans for sponsorship and outreach.</div>'));
 
graph.commit('evolv', '6 July 2015', $('<div>Our first 3D printed part - peristaltic pump. Evolvinator parts ordered. Beginning plans for sponsorship and outreach.</div>'));
 
graph.commit('march', '7 July 2015', $('<div>Marchantia project suggestion. Two possible ideas: Evolvinator, Marchantia. Established project objectives, linked in with 3D printed microscope.</div>'));
 
graph.commit('march', '7 July 2015', $('<div>Marchantia project suggestion. Two possible ideas: Evolvinator, Marchantia. Established project objectives, linked in with 3D printed microscope.</div>'));
−
graph.merge('evolv', 'meta', '10 July 2015', $('<div>Evolvinator project ended</div>'));
+
graph.merge('evolv', 'meta', '13 July 2015', $('<div>Evolvinator project ended</div>'));
−
graph.commit('optics', "Alors c'est qui le papa?");
+
graph.merge('enose', 'meta', '13 July 2015', $('<div>Bionose project ended</div>'));
−
graph.commit('design', 'lol');
+
graph.commit('optics', '14 July 2015', $('<div></div>'));
−
graph.commit('sw', 'heh');
+
graph.commit('design', '14 July 2015', $('<div></div>'));
−
graph.merge('sw', 'optics', 'merge branch');
+
graph.commit('sw', 14 July 2015', $('<div></div>'));
−
graph.adopt('design', 'sw');
+
−
graph.commit('bio', 'kek');
+
−
graph.commit('bio');
+
−
graph.commit('design', 'lel');
+
−
graph.merge('bio', 'optics', 'done');
+
−
graph.commit('sw', 'hi');
+
−
graph.merge('sw', 'meta');
+
−
graph.merge('design');
+
−
graph.adopt('optics', 'design');
+
−
graph.commit('design', 'testing');
+
−
graph.commit('meta', 'test', $('<div>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sint, ducimus, qui fuga corporis veritatis doloribus iure nulla optio dolores maiores dolorum ullam alias cum libero obcaecati cupiditate sit illo aperiam possimus voluptatum similique neque explicabo quibusdam aspernatur dolorem. Quod, corrupti magni explicabo nam sequi nesciunt accusamus aliquam dolore! Cumque, quam fugiat ab veritatis. Quia, maxime quas perferendis cupiditate explicabo at atque iusto accusamus. Nesciunt veniam quidem nemo doloribus! Dolore, cupiditate, adipisci, voluptate quam nihil ipsa placeat dolor possimus minus quas nostrum eaque in dicta autem eligendi rerum facilis nesciunt sunt doloremque suscipit enim iure vitae eius voluptates tempora tenetur hic</div>'));
+
−
graph.adopt('meta','bio');
+
−
graph.commit('bio', 'testing 1..2...3');
+
−
graph.commit('sw', 'foobar');
+
−
graph.merge('design', 'meta', 'blah');
+
−
graph.merge('optics', 'meta', 'complete!');
+
  
 
//]]>
 
//]]>

Revision as of 08:28, 16 July 2015

CAMBRIDGE-JIC

Notebook