Skip to content

C
cloud-quote
Commit 04ca1157 authored by Sven Franck's avatar Sven Franck
Browse files
Options

added machine_names, updated jIO search options

parent 3df13f3f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 995 additions and 168 deletions
data/machine_config.json
View file @ 04ca1157
{}
\ No newline at end of file
{"COMP-1354":{"name":"COMP-1354","provider":"Atlantic.Net","alias":"Atlantic"},"COMP-1288":{"name":"COMP-1288","provider":"Rackspace_Dallas","alias":"Rackspace"},"COMP-1394":{"name":"COMP-1394","provider":"Atlantic.Net","alias":"Atlantic"},"COMP-1395":{"name":"COMP-1395","provider":"vmWare.vCloud","alias":"vmWare"},"COMP-1283":{"name":"COMP-1283","provider":"Azure_WestUS","alias":"Azure"},"COMP-1393":{"name":"COMP-1393","provider":"Joyent_USEast1","alias":"Joyent"},"COMP-1392":{"name":"COMP-1392","provider":"Azure_East_US","alias":"Azure"},"COMP-156":{"name":"COMP-156","provider":"ERP5-TEST-NODE-DS61-XA","alias":"ERP5"},"COMP-1286":{"name":"COMP-1286","provider":"AWS_US-EAST-1c","alias":"Amazon"}}
\ No newline at end of file
data/machine_info.json deleted 100644 → 0
View file @ 3df13f3f
[
{"mech":"COMP-1354", "provider":"AtlanticNet"},
{"mech":"COMP-1288", "provider":"Rackspace_Dallas"},
{"mech":"COMP-1394", "provider":"Atlantic.Net"},
{"mech":"COMP-1395", "provider":"vmWare.vCloud"},
{"mech":"COMP-1283", "provider":"Azure_WestUS"},
{"mech":"COMP-1393", "provider":"Joyent_USEast1"},
{"mech":"COMP-1392", "provider":"Azure_East_US"},
{"mech":"COMP-156", "provider":"ERP5-TEST-NODE-DS61-XA"},
{"mech":"COMP-1286", "provider":"AWS_US-EAST-1c"}
]
\ No newline at end of file
data/machine_parameters.json 0 → 100644
View file @ 04ca1157
This diff is collapsed.
data/old_stats.json 0 → 100644
View file @ 04ca1157
This diff is collapsed.
data/stats.json
View file @ 04ca1157
This diff is collapsed.
gadgets/configure.html
View file @ 04ca1157
......@@ -235,8 +235,49 @@
var ajaxObject = {
url: "../data/machine_config.json",
target: "",
successHandler : function (data, target) {
// build table options and defaults
successHandler : function (data) {
var i;
//if ($.fn.fauna.jio_machine_config === undefined) {
$.fn.fauna.jio_machine_config = data;
$.fn.fauna.named_providers = [];
for (machine in data) {
m = data[machine];
$.fn.fauna.named_providers.push(m["alias"]);
}
/* DOES NOT WORK
* 1. Performance loss looking up values from localstorage
* 2. Impossible to loop and trigger async GET inside a loop
* 3. LEFT JOIN would be nice...
$.fn.fauna.jio_machine_config = jIO.newJio({
"type": "local",
"username": "mech_config",
"application_name": "cloudquote"
});
$.fn.fauna.machines_branded = [];
// build configuration options
for (machine in data) {
if (data.hasOwnProperty(machine)) {
m = data[machine];
// into config/pricing into arrays here - this should be a ram lookup table
// maybe already create the complexQuery object here, so it can be
// queried on vs creating a simple array of objects?
// lookup array
$.fn.fauna.machines_branded.push(m["name"]);
$.fn.fauna.jio_machine_config.put({
"_id": m["name"]
, "name": m["name"]
, "provider":m["provider"]
, "alias": m["alias"]
// add configuration and pricing
});
}
}
*/
//}
// build configuration sliders
},
errorHandler : function (XMLHttpRequest, textStatus, errorThrown) {
//
......@@ -262,13 +303,28 @@
handleDataInResponse: "true",
formdata : formdata,
successHandler : function (data) {
var m, lookUp, provider, lookup;
$.fn.util.spin('show');
// add entries to localstorage. We should only be getting 10 at a time
for (machine in data) {
if (data.hasOwnProperty(machine)) {
m = data[machine];
lookUp = $.fn.fauna.jio_machine_config[machine];
if (lookUp !== undefined) {
provider = lookUp["provider"];
alias = lookUp["alias"];
searchtext = lookUp["alias"].toLowerCase() +", "
+ lookUp["provider"].toLowerCase() + ", "
+ machine.toLowerCase();
} else {
provider = "";
alias = "";
searchtext = "";
}
$.fn.fauna.jio_item_config.put({
"_id": machine,
"searchtext": searchtext,
"alias": alias,
"provider": provider,
"init": m["init"],
"last": m["last"],
"downtime":m["machine_downtime"],
......
gadgets/results.html
View file @ 04ca1157
This diff is collapsed.
js/controller.js
View file @ 04ca1157
......@@ -142,50 +142,6 @@ define([], function () {
};
// ===========================================================
// debug timer
(function( $, window, undefined ) {
function getTime() {
return ( new Date() ).getTime();
}
var startChange, stopChange, startLoad, stopLoad, startEnhance, stopEnhance, startTransition, stopTransition, lock = 0;
$( document )
.bind( "pagebeforechange", function( e, data) {
if ( typeof data.toPage === "string" ) {
startChange = stopChange = startLoad = stopLoad = startEnhance = stopEnhance = startTransition = stopTransition = getTime();
}
})
.bind( "pagebeforeload", function() {
startLoad = stopLoad = getTime();
})
.bind( "pagebeforecreate", function() {
if ( ++lock === 1 ) {
stopLoad = startEnhance = stopEnhance = getTime();
}
})
.bind( "pageinit", function() {
if ( --lock === 0 ) {
stopEnhance = getTime();
}
})
.bind( "pagebeforeshow", function() {
startTransition = stopTransition = getTime();
})
.bind( "pageshow", function() {
stopTransition = getTime();
})
.bind( "pagechange", function( e, data ) {
if ( typeof data.toPage === "object" ) {
stopChange = getTime();
console.log("load + processing: " + ( stopLoad - startLoad )+ "\nenhance: " + ( stopEnhance - startEnhance )+ "\ntransition: " + ( stopTransition - startTransition )+ "\ntotalTime: " + ( stopChange - startChange ) );
startChange = stopChange = startLoad = stopLoad = startEnhance = stopEnhance = startTransition = stopTransition = 0;
}
});
})( jQuery, window );
// global page handling
$(document).on('pagecreate', 'div:jqmData(role="page")', function() {
......@@ -213,12 +169,8 @@ define([], function () {
target: "",
param1: null,
param2: null,
successHandler : function (data, target) {
},
errorHandler : function (XMLHttpRequest, textStatus, errorThrown) {
}
successHandler : function (data, target) {},
errorHandler : function (XMLHttpRequest, textStatus, errorThrown) {}
};
util.ajaxContent(ajaxObject);
}
......
js/libs/jio/complex_queries.js
View file @ 04ca1157
......@@ -6,9 +6,7 @@
(function (scope) {
"use strict";
console.log("aloha in scope - complexqueries");
console.log(scope)
Object.defineProperty(scope, "ComplexQueries", {
Object.defineProperty(scope, "ComplexQueries", {
configurable: false,
enumerable: false,
writable: false,
......
js/libs/jqm/jqm.js
View file @ 04ca1157
......@@ -8549,7 +8549,7 @@ $.widget( "mobile.table", $.mobile.widget, {
return $('<div/>');
}))
.grid({ grid: this.options.grid })
.insertBefore($table);
.insertBefore($table)
}
......@@ -8560,7 +8560,7 @@ $.widget( "mobile.table", $.mobile.widget, {
return $('<div/>');
}))
.grid({ grid: this.options.grid })
.insertAfter($table);
.insertAfter($table)
}
// xxx table - move slots into grid
......@@ -8601,6 +8601,7 @@ $.widget( "mobile.table", $.mobile.widget, {
if( blocktally > 0){
blocktally -= 1;
} else {
// Store "cells" data on header as a reference to all cells in the same column as this TH
if (create === undefined) {
$(this).jqmData("cells","");
......@@ -9364,7 +9365,7 @@ $.widget("mobile.filterview", $.mobile.widget, {
"class": "ui-" + $tag + "-filter ui-bar-" + o.filterTheme,
"role": "search"
})
search = $( "<input>", {
placeholder: o.filterPlaceholder
})
......@@ -9380,7 +9381,7 @@ $.widget("mobile.filterview", $.mobile.widget, {
wrapper[ $tag === "table" ? "appendTo" : "insertBefore"]( $tag === "table" ?
$el.siblings('.table-top-wrapper, .table-bottom-wrapper').children('div').eq(o.filterSlot-1) : $el );
}
// xxx filter - add filter to table wrapper or before list
wrapper
.submit( function( e ) {
......
tmp/tmp_results.html
View file @ 04ca1157
......@@ -8,7 +8,7 @@
</head>
<body>
<table>
<!-- tmp_result_row start --><tr id="tmp_result_row"><td><a href="#" title="tmp_title"><span class="image_wrapper"><img src="tmp_image_path" alt=""></span></a><h2 class="provider_name small">tmp_name</h2></td><td><span class="key super">tmp_name</span></td><td><span class="key super key_loss">tmp_data_loss</span></td><td><span class="key super key_availability">tmp_percentile&nbsp;%</span></td><td><span class="key super key_cost">tmp_price</span></td><td><a data-position-to="window" class="t scale-a" href="#provider_info_tmp_count" data-rel="popup" data-role="button" data-theme="c" data-icon="info" data-inline="true" data-i18n-target=".ui-btn-text" data-i18n="[title]gen.details_info;[html]gen.details"></a><div data-role="popup" id="provider_info_tmp_count" data-overlay-theme="a" data-theme="c" class="provider_popup ui-content ui-collapsible-popup"><div data-role="collapsible-set" data-type="horizontal" data-theme="f" data-content-theme="c"><div data-role="collapsible" data-collapsed-icon="arrow-d" data-expanded-icon="info" data-collapsed="false"><h1>Load</h1></div><div data-role="collapsible" data-collapsed-icon="pulse" data-expanded-icon="info"><h1>CPU</h1></div><div data-role="collapsible" data-collapsed="false" data-collapsed-icon="gear" data-expanded-icon="info"><h1>DTB</h1></div><div data-role="collapsible" data-collapsed-icon="chat" data-expanded-icon="info"><h1>Lang</h1></div><div data-role="collapsible" data-collapsed-icon="flash" data-expanded-icon="info"><h1>IO</h1></div></div></div></td></tr><!-- tmp_result_row end -->
<!-- tmp_result_row start --><tr id="tmp_result_row"><td><a href="#" title="tmp_title"><span class="image_wrapper"><img src="tmp_image_path" alt="tmp_alias"></span></a><h2 class="provider_name small">tmp_alias</h2></td><td><span class="key super">tmp_name</span></td><td><span class="key super key_availability">tmp_percentile&nbsp;%</span></td><td><span class="key super key_cost">tmp_price</span></td><td><a data-position-to="window" class="t scale-a popup_trigger" href="#provider_details" data-reference="tmp_name" data-rel="popup" data-role="button" data-theme="c" data-icon="info" data-inline="true" data-i18n-target=".ui-btn-text" data-i18n="[title]gen.details_info;[html]gen.details"></a></td></tr><!-- tmp_result_row end -->
<!---
<tr>
<td>
......@@ -19,9 +19,6 @@
<td>
<span class="key super">tmp_name</span>
</td>
<td>
<span class="key super key_loss">tmp_data_loss</span>
</td>
<td>
<span class="key super key_availability">tmp_percentile&nbsp;%</span>
</td>
......@@ -29,26 +26,7 @@
<span class="key super key_cost">tmp_price</span>
</td>
<td>
<a data-position-to="window" class="t scale-a" href="#provider_info" data-rel="popup" data-role="button" data-theme="c" data-icon="info" data-inline="true" data-i18n-target=".ui-btn-text" data-i18n="[title]gen.details_info;[html]gen.details"></a>
<div data-role="popup" id="provider_info_tmp_count" data-overlay-theme="a" data-theme="c" class="provider_popup ui-content ui-collapsible-popup">
<div data-role="collapsible-set" data-type="horizontal" data-theme="f" data-content-theme="c">
<div data-role="collapsible" data-collapsed-icon="arrow-d" data-expanded-icon="info" data-collapsed="false">
<h1>Load</h1>
</div>
<div data-role="collapsible" data-collapsed-icon="pulse" data-expanded-icon="info">
<h1>CPU</h1>
</div>
<div data-role="collapsible" data-collapsed="false" data-collapsed-icon="gear" data-expanded-icon="info">
<h1>DTB</h1>
</div>
<div data-role="collapsible" data-collapsed-icon="chat" data-expanded-icon="info">
<h1>Lang</h1>
</div>
<div data-role="collapsible" data-collapsed-icon="flash" data-expanded-icon="info">
<h1>IO</h1>
</div>
</div>
</div>
<a data-position-to="window" class="t scale-a" href="#provider_details" data-rel="popup" data-role="button" data-theme="c" data-icon="info" data-inline="true" data-i18n-target=".ui-btn-text" data-i18n="[title]gen.details_info;[html]gen.details"></a>
</td>
</tr>
--->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7