pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

laser safety notes appear and are closable

Browse source
This commit is contained in:
Teja 2015-02-07 19:19:26 +01:00
parent e4cc81d643
commit 0e829e8e9d
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/octoprint/plugins/laser_safety_notes/__init__.py
View file

@ -48,7 +48,7 @@ class LaserSafetyNotesPlugin(octoprint.plugin.SettingsPlugin,
def on_settings_load(self): def on_settings_load(self):
cfg = dict( cfg = dict(
current_profile_id=s.get(["agreed_to_safety_notes"]), has_agreed = s.get(["agreed_to_safety_notes"]),
) )
return cfg return cfg
@ -60,7 +60,11 @@ class LaserSafetyNotesPlugin(octoprint.plugin.SettingsPlugin,
##~~ TemplatePlugin API ##~~ TemplatePlugin API
def get_template_vars(self): def get_template_vars(self):
d = dict() clazz = "show"
if(s.get(["agreed_to_safety_notes"])):
clazz = "hide"
d = dict(has_agreed_class = clazz)
print("foo", d)
return d return d
def get_template_folder(self): def get_template_folder(self):

21
src/octoprint/plugins/laser_safety_notes/static/js/laserSafetyNotes.js
View file

@ -4,20 +4,29 @@ $(function() {
var self = this; var self = this;
self.settings = params[0]; self.settings = params[0];
self.s = ko.observable(self.settings.settings);
self.agreed_to_safety_notes = ko.computed(function(){
console.log(self.s());
// if(self.s && self.s().plugins)
// return self.s.plugins.laser_safety_notes;
return false;
});
self.onStartup = function(){ self.onStartup = function(){
// self.requestData(); $('#laser_safety_overlay').modal("show");
// self.control.showZAxis = ko.computed(function(){ console.log("settings", self.settings.settings);
// var has = self.currentProfileData()['zAxis']();
// return has;
// }); // dependency injection
}; };
self.agree = function(){
$('#laser_safety_overlay').modal("hide");
}
} }
// view model class, identifier, parameters for constructor, container to bind to // view model class, identifier, parameters for constructor, container to bind to
ADDITIONAL_VIEWMODELS.push([LaserSafetyNotesViewModel, ADDITIONAL_VIEWMODELS.push([LaserSafetyNotesViewModel,
["settingsViewModel"], ["settingsViewModel"],
document.getElementById("laser_safety_notes")]); document.getElementById("laser_safety_overlay")]);
}); });