Commit bf7fc9a8 authored by Ricco Førgaard's avatar Ricco Førgaard
Browse files

Renamed package to nesstartouch.

parent 5e2d6f7e
{
"name": "TabulationMobile",
"name": "NesstarTouch",
"version": "0.0.1",
"ignore": [
"**/.*",
......
......@@ -33,7 +33,7 @@
async: true,
packages: [
{
name: 'nesstarmobile',
name: 'nesstartouch',
location: base + '/js/'
}
]
......@@ -76,9 +76,9 @@
'dojox/mobile/ScrollableView',
'dojox/mobile/Button',
'dojox/mobile/TextBox',
'nesstarmobile/StudyList',
'nesstarmobile/VariableList',
'nesstarmobile/SettingsView'],
'nesstartouch/StudyList',
'nesstartouch/VariableList',
'nesstartouch/SettingsView'],
function(parser) {
parser.parse();
});
......@@ -91,7 +91,7 @@
<span data-dojo-type="dojox.mobile.ToolBarButton" data-dojo-props="moveTo: '#settings'">Settings</span>
Select Study
</h1>
<ul id="studyListData" data-dojo-type="nesstarmobile.StudyList"
<ul id="studyListData" data-dojo-type="nesstartouch.StudyList"
data-dojo-props="variableHeight:true">
</ul>
</div>
......@@ -176,7 +176,7 @@
</div> -->
<!-- side bar -->
<div id="settings" data-dojo-type="nesstarmobile.SettingsView">
<div id="settings" data-dojo-type="nesstartouch.SettingsView">
<h1 data-dojo-type="dojox.mobile.Heading" data-dojo-props="fixed: 'top', back: 'Back'">Settings</h1>
<div id="settings.studyItemsContainer" data-dojo-type="dojox.mobile.Container">
......@@ -216,7 +216,7 @@
</h1>
<h2 data-dojo-type="dojox.mobile.RoundRectCategory" data-dojo-props="fixed: true">Selected Variables</h2>
<ul id="variables.selected" data-dojo-type="dojox.mobile.RoundRectStoreList"></ul>
<ul id="variables.all" data-dojo-type="nesstarmobile.VariableList"></ul>
<ul id="variables.all" data-dojo-type="nesstartouch.VariableList"></ul>
</div>
</body>
</html>
......@@ -5,30 +5,30 @@ define(['dojo/_base/declare',
'dojo/_base/array',
'dojo/store/Observable',
'dojo/store/Memory',
'nesstarmobile/VariableList',
'nesstartouch/VariableList',
'dojox/mobile/ScrollableView'], function(declare, dom, domStyle, registry, arrayUtils, Observable, Memory, VariableList, ScrollableView) {
return declare('nesstarmobile.SettingsView', [ScrollableView], {
return declare('nesstartouch.SettingsView', [ScrollableView], {
startup: function() {
this.inherited(arguments);
this.setUpStores();
},
setUpStores : function() {
if (!window.nesstarmobile.stores) {
window.nesstarmobile.stores = {};
if (!window.nesstartouch.stores) {
window.nesstartouch.stores = {};
}
window.nesstarmobile.stores.rowVariables = new Observable(new Memory());
window.nesstartouch.stores.rowVariables = new Observable(new Memory());
var rowVariableList = this.getWidget('settings.rowVariables');
rowVariableList.setStore(window.nesstarmobile.stores.rowVariables);
rowVariableList.setStore(window.nesstartouch.stores.rowVariables);
window.nesstarmobile.stores.rowVariables.add(this.createAddVariableListItem('row'));
window.nesstartouch.stores.rowVariables.add(this.createAddVariableListItem('row'));
window.nesstarmobile.stores.columnVariables = new Observable(new Memory());
window.nesstartouch.stores.columnVariables = new Observable(new Memory());
var columnVariableList = this.getWidget('settings.columnVariables');
columnVariableList.setStore(window.nesstarmobile.stores.columnVariables);
columnVariableList.setStore(window.nesstartouch.stores.columnVariables);
window.nesstarmobile.stores.columnVariables.add(this.createAddVariableListItem('column'));
window.nesstartouch.stores.columnVariables.add(this.createAddVariableListItem('column'));
},
createAddVariableListItem: function(type) {
......@@ -36,7 +36,7 @@ define(['dojo/_base/declare',
'label': 'Add variables',
'moveTo': '#variables',
onClick: function(e) {
window.nesstarmobile.variableType = type;
window.nesstartouch.variableType = type;
}
};
},
......@@ -46,7 +46,7 @@ define(['dojo/_base/declare',
},
populate: function() {
if (typeof window.nesstarmobile.study == 'undefined') {
if (typeof window.nesstartouch.study == 'undefined') {
this.hideStudyRelatedWidgets();
return false;
}
......@@ -73,13 +73,13 @@ define(['dojo/_base/declare',
setCurrentStudyName: function() {
var listItem = this.getWidget('settings.currentStudyLabel');
var label = window.nesstarmobile.study.name;
var label = window.nesstartouch.study.name;
listItem.set('rightText', label);
},
setCurrentAnalysisType: function() {
var listItem = this.getWidget('settings.currentAnalysisType');
var analysisType = window.nesstarmobile.currentAnalysisType;
var analysisType = window.nesstartouch.currentAnalysisType;
if (!analysisType) {
analysisType = "Tabulation";
}
......
......@@ -6,9 +6,9 @@ define(['dojo/_base/declare',
'dojox/mobile/RoundRectStoreList',
'dojox/mobile/ListItem',
'dojo/DeferredList',
'nesstarmobile/_RestMixin'],
'nesstartouch/_RestMixin'],
function(declare, arrayUtil, when, Observable, Memory, RoundRectList, ListItem, DeferredList, _ListMixin) {
return declare('nesstarmobile.StudyList', [RoundRectList, _ListMixin], {
return declare('nesstartouch.StudyList', [RoundRectList, _ListMixin], {
serviceUrl: '/study/list',
startup: function() {
......@@ -39,7 +39,7 @@ define(['dojo/_base/declare',
'variableHeight': true,
'study': study,
onClick: function(e) {
window.nesstarmobile.study = this.params.study;
window.nesstartouch.study = this.params.study;
}
};
this.store.add(item);
......
define(['dojox/grid/DataGrid',
'nesstarmobile/_RestMixin'], function(DataGrid, _RestMixin) {
return declare('nesstarmobile.Tabulation', [DataGrid, _RestMixin]) {
'nesstartouch/_RestMixin'], function(DataGrid, _RestMixin) {
return declare('nesstartouch.Tabulation', [DataGrid, _RestMixin]) {
serviceUrl: '/tabulate/${studyId}/tabulate',
data: {
......
......@@ -3,8 +3,8 @@ define(['dojo/_base/declare',
'dojo/store/Observable',
'dojo/store/Memory',
'dojox/mobile/RoundRectStoreList',
'nesstarmobile/_RestMixin'], function(declare, arrayUtil, Observable, Memory, RoundRectList, _RestMixin) {
return declare('nesstarmobile.VariableList', [RoundRectList, _RestMixin], {
'nesstartouch/_RestMixin'], function(declare, arrayUtil, Observable, Memory, RoundRectList, _RestMixin) {
return declare('nesstartouch.VariableList', [RoundRectList, _RestMixin], {
serviceUrl: '/study/${studyId}/variables/page/${pageNo}',
page : 0,
hasMoreElements: true,
......@@ -24,7 +24,7 @@ define(['dojo/_base/declare',
},
init: function() {
this.studyId = window.nesstarmobile.study.id;
this.studyId = window.nesstartouch.study.id;
this.setStore(new Observable(new Memory()));
this.populate(this.onVariablesReceived, {'studyId': this.studyId, 'pageNo': this.page});
},
......@@ -71,17 +71,17 @@ define(['dojo/_base/declare',
},
getVariableStore: function() {
var type = window.nesstarmobile.variableType;
var type = window.nesstartouch.variableType;
if (type == 'column') {
return window.nesstarmobile.stores.columnVariables;
return window.nesstartouch.stores.columnVariables;
} else if (type == 'row') {
return window.nesstarmobile.stores.rowVariables;
return window.nesstartouch.stores.rowVariables;
}
return null;
},
isSettingMeasure: function() {
return window.nesstarmobile.variableType == 'measure';
return window.nesstartouch.variableType == 'measure';
}
})
})
define(['dojo/_base/declare',
'dojo/_base/lang',
'dojo/request',], function(declare, lang, request) {
return declare('nesstarmobile._RestMixin', null, {
return declare('nesstartouch._RestMixin', null, {
defaultOptions: {
method: 'GET',
preventCache: true,
......
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