Skip to content

Commit

Permalink
Forgot to commit half of the things. Smart.
Browse files Browse the repository at this point in the history
  • Loading branch information
Denis Moreno committed Jun 27, 2014
1 parent b8f579c commit 7b5207b
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 312 deletions.
19 changes: 10 additions & 9 deletions dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -1011,10 +1011,11 @@ function drawBarchartPlot(dataset, divID, width, height, bottom_padding, maxY) {
* @param {Number} height panel plot height
* @param {Number} draw_width available drawing widths
*/
function drawProcessPanels(sample_json, plotDate, startDate, height, draw_width){
function drawProcessPanels(sample_json, plotDate, startDate, height, draw_width, ptype){
// Reduce sample data to project level
var reduced = reduceToProject(sample_json);

ptype = typeof ptype !== undefined ? ptype : "Production"; //Default is production, unless something else is given
// keys for time calculations
var total = {
startKey: "Queue date",
Expand Down Expand Up @@ -1071,14 +1072,14 @@ function drawProcessPanels(sample_json, plotDate, startDate, height, draw_width)
*/
//Generate data sets
var recCtrlLoad = generateRecCtrlStackDataset(sample_json, today);
var sampleQueue = generateQueueSampleStackDataset(sample_json, today);
var libprepLaneQueue = generateQueueLaneLPStackDataset(sample_json, today);
var finlibLaneQueue = generateQueueLaneFLStackDataset(sample_json, today);
var sampleLoadLibprep = generateLibprepSampleLoadDataset(sample_json, today);
var laneLoadLibprep = generateLibprepLaneLoadDataset(sample_json, today);
var seqLoad = generateSeqLoadDataset(sample_json, today);
var sampleQueue = generateQueueSampleStackDataset(sample_json, today, ptype);
var libprepLaneQueue = generateQueueLaneLPStackDataset(sample_json, today, ptype);
var finlibLaneQueue = generateQueueLaneFLStackDataset(sample_json, today, ptype);
var sampleLoadLibprep = generateLibprepSampleLoadDataset(sample_json, today, ptype);
var laneLoadLibprep = generateLibprepLaneLoadDataset(sample_json, today, ptype);
var seqLoad = generateSeqLoadDataset(sample_json, today, ptype);

//console.log(sampleQueue);
console.log(sampleQueue);

//Set the 'normal' max values for the different load visualizations
var rcNormalMax = 20; //# projects
Expand Down Expand Up @@ -1258,4 +1259,4 @@ function drawProcessPanels(sample_json, plotDate, startDate, height, draw_width)
//99999999
);

}
}
288 changes: 0 additions & 288 deletions dashboard_all.html

This file was deleted.

3 changes: 2 additions & 1 deletion getCouchDbData.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
// get user:password from file. File should contain one line on the form username:password
$fhandle = fopen("user_cred.txt", 'r');
$user_password = fgets($fhandle);
$user_password = str_replace("\n", '', $user_password);// in case there is \n at the end of the line
fclose($fhandle);

// set up curl and call couchDb view
Expand Down Expand Up @@ -63,4 +64,4 @@
$result = curl_exec($ch);
curl_close($ch);
echo $result;
?>
?>
1 change: 0 additions & 1 deletion index.html

This file was deleted.

Loading

0 comments on commit 7b5207b

Please sign in to comment.