atlanticbiomedical/biomedjs
1
0
Fork 0
mirror of https://github.com/atlanticbiomedical/biomedjs.git synced 2025-07-02 00:47:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

changed on server

Browse Source
This commit is contained in:
Dobie Wollert
2013-07-19 02:38:07 -04:00
parent 4ca472f2cb
commit 1c2ba2737d
9 changed files with 69 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/tags.js
View File

@ -4,8 +4,7 @@ var mongoose = require('mongoose'),
module.exports = function(piler) {
return {
index: function(req, res, next) {
host = String(req.headers.host);
host = String(req.headers['x-forwarded-host']);
host = host.split(':')[0];
if (host != 'n.atlb.co') {
@ -47,4 +46,4 @@ module.exports = function(piler) {
});
}
}
}
}

4
app/views/index.jade
View File

@ -10,6 +10,10 @@ html(lang="en", ng-app="biomed", ng-controller="biomed.PageCtrl")
a.brand(href='/', target='_self') Atlantic Biomedical
progress-panel
ul.nav.pull-right(ng-controller='biomed.AccountCtrl')
li
a(href='https://docs.google.com/a/atlanticbiomedical.com/forms/d/1i7CyNR2lcrz7bOL7u9ssKiMB2iBmXqOdvVKC0GRzRtY/viewform', target='_blank')
i.icon-shopping-cart
| Sales
li
a(href='https://docs.google.com/a/atlanticbiomedical.com/forms/d/16tPHoTkEQB7fqXxBDZk_7s-WLz6a3eXVBWiUyA0fntM/viewform', target='_blank')
i.icon-thumbs-down

23
app/views/tag.jade
View File

@ -41,6 +41,8 @@ html(lang="en", ng-app="tags", ng-controller="tags.PageCtrl")
dl.dl-horizontal(ng-show='tag')
dt Client
dd  {{payload.tag.client.name}} ({{payload.tag.client.identifier}})
dt Client Device ID
dd  {{tag.clientDeviceId}}
dt Device
dd  {{tag.device}}
dt Make
@ -51,10 +53,14 @@ html(lang="en", ng-app="tags", ng-controller="tags.PageCtrl")
dd  {{tag.serialNumber}}
dt Purchase Date
dd  {{tag.purchaseDate}}
dt Warranty Expiration
dd  {{tag.deviceWarrantyExpiration}}
dt Test
dd  {{tag.test}}
dt Room #
dd  {{tag.roomNumber}}
dt PO Number
dd  {{tag.poNumber}}
a.btn.btn-primary(href='/auth', ng-show='tag')
| Edit Tag
@ -70,8 +76,10 @@ html(lang="en", ng-app="tags", ng-controller="tags.PageCtrl")
select(ng-model='client', required='required', ng-options='client._id as client.name + " (" + client.identifier + ")" for client in clients')
</select>
.control-group
label.control-label Client Device ID
.controls
input.text(ng-model='tag.clientDeviceId')
.control-group
label.control-label Device
@ -93,6 +101,11 @@ html(lang="en", ng-app="tags", ng-controller="tags.PageCtrl")
label.control-label Purchase Date
.controls
input.text(type='date', ng-model='tag.purchaseDate')
.control-group
label.control-label Device Warranty Expiration
.controls
input.text(type='date', ng-model='deviceWarrantyExpiration')
.control-group
label.control-label Test
.controls
@ -101,5 +114,11 @@ html(lang="en", ng-app="tags", ng-controller="tags.PageCtrl")
label.control-label Room #
.controls
input.text(ng-model='tag.roomNumber')
.control-group
label.control-label PO Number
.controls
input.text(ng-model='tag.poNumber')
.control-group
button.btn.btn-primary(ng-click='save()') Save

8
config/auth.js
View File

@ -8,7 +8,11 @@ module.exports = function(app, passport) {
]}));
app.get('/auth/callback', function(req, res, next) {
passport.authenticate('google', function(err, user, info) {
var options = {
callbackURL: 'http://' + req.headers['x-forwarded-host'] + '/auth/callback'
};
console.log(options);
passport.authenticate('google', options, function(err, user, info) {
var redirectUrl = '/';
if (err) { return next(err); }
@ -42,4 +46,4 @@ module.exports = function(app, passport) {
next();
}
};
};
};

2
config/config.js
View File

@ -2,7 +2,7 @@ module.exports = {
development: {
root: require('path').normalize(__dirname + '/..'),
debug: true,
database: 'mongodb://biomed.akira.gs/biomed_devel2',
database: 'mongodb://wootbox.wootroot.me/biomed_devel2',
auth: {
clientId: '223145213165.apps.googleusercontent.com',
clientSecret: '8MRNar9E_pRTOGTQonPzYOW_',

4
config/passport.js
View File

@ -16,7 +16,7 @@ module.exports = function(passport, config) {
passport.use(new GoogleStrategy({
clientID: config.auth.clientId,
clientSecret: config.auth.clientSecret,
callbackURL: config.auth.callback
// callbackURL: config.auth.callback
},
function(accessToken, refreshToken, profile, done) {
console.log(profile);
@ -52,4 +52,4 @@ module.exports = function(passport, config) {
});
});
}));
}
}

29
logs/crash.log
View File

@ -0,0 +1,29 @@
Server was reset on 06.07.2013 at 00:32:52
Server was reset on 06.07.2013 at 00:32:52
Server was reset on 06.07.2013 at 00:32:52
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.24.2013 at 10:40:55
Server was reset on 06.26.2013 at 07:24:10
Server was reset on 06.26.2013 at 07:24:10
Server was reset on 06.26.2013 at 07:24:10
Server was reset on 06.26.2013 at 07:24:10
Server was reset on 06.26.2013 at 07:24:10
Server was reset on 07.01.2013 at 02:38:49

3
public/partials/workorders/add.html
View File

@ -37,6 +37,7 @@
<option value="Delivery">Delivery</option>
<option value="Diagnose Problem">Diagnose Problem</option>
<option value="Install Parts">Install Parts</option>
<option value="New Opportunity">New Opportunity</option>
<option value="Off">Off</option>
<option value="PM Reschedule">PM Reschedule</option>
<option value="Preventive Maintenance">Preventive Maintenance</option>
@ -159,7 +160,7 @@
<div class="control-group">
<label class="control-label">Techs</label>
<div class="controls">
<select multiple ui-select2 ng-model="model.techs" data-placeholder="Choose a Tech" class="input-xxlarge">
<select multiple ui-select2 ng-model="model.techs" data-placeholder="Choose a Tech - Check the schedule below before scheduling." class="input-xxlarge">
<option ng-repeat="tech in allUsers" value="{{tech._id}}">{{tech.name.first}} {{tech.name.last}}</option>
</select>
</div>

3
public/partials/workorders/edit.html
View File

@ -56,6 +56,7 @@
<option value="Delivery">Delivery</option>
<option value="Diagnose Problem">Diagnose Problem</option>
<option value="Install Parts">Install Parts</option>
<option value="New Opportunity">New Opportunity</option>
<option value="Off">Off</option>
<option value="PM Reschedule">PM Reschedule</option>
<option value="Preventive Maintenance">Preventive Maintenance</option>
@ -189,7 +190,7 @@
<div class="control-group">
<label class="control-label">Techs</label>
<div class="controls">
<select multiple ui-select2 ng-model="scheduling.techs" data-placeholder="Choose a Tech" class="input-xxlarge">
<select multiple ui-select2 ng-model="scheduling.techs" data-placeholder="Choose a Tech- Check the schedule below before scheduling" class="input-xxlarge">
<option ng-repeat="tech in allUsers" value="{{tech._id}}">{{tech.name.first}} {{tech.name.last}}</option>
</select>
</div>