Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
ffdfa0b
Add simple getting started
luciaeveberger Oct 24, 2017
ae65fca
Adds seeder
luciaeveberger Oct 24, 2017
bf4d662
Removes .idea files from being tracked
luciaeveberger Oct 24, 2017
e4e2a4e
adds the is development clause
luciaeveberger Oct 24, 2017
ddb6aba
Removes pg unnecessary requirement
luciaeveberger Oct 25, 2017
730d88a
Fixes admin sort @MILK
luciaeveberger Oct 25, 2017
c233d0c
Adds seeding mechanism that scales better. and adds accommodation tab…
luciaeveberger Oct 26, 2017
1c110de
adds spacing on ready
luciaeveberger Oct 26, 2017
06e1c9b
Balances out the gender seeds
luciaeveberger Oct 30, 2017
2b642dc
takes old code and restores to functional
luciaeveberger Oct 30, 2017
43d0677
Get First draft of Admin list that was create Jan 11, 2017
kamolchanokTa Oct 25, 2017
6ab1f4b
Adds the accommodation as part of the table (to add them here)
luciaeveberger Oct 31, 2017
bda925d
Add accommodation page
kamolchanokTa Oct 29, 2017
44ad4d1
Merge pull request #6 from lberger1993/seeding_accomodation_collection
kamolchanokTa Oct 31, 2017
c79921d
merge conflict
kamolchanokTa Nov 3, 2017
3e98957
fix error on admin.list
kamolchanokTa Nov 3, 2017
7f5cd5f
remove fix
kamolchanokTa Nov 3, 2017
27a2577
fixes merge conflict
luciaeveberger Nov 3, 2017
f94377b
Add accommodation feature in admin.add_new
kamolchanokTa Nov 3, 2017
cf5457a
Progress bar added
grossetto Nov 8, 2017
b592870
Add icon
kamolchanokTa Nov 8, 2017
8a6d8e6
Add mock up map for accommodation and buS
Nov 8, 2017
ae49b84
Merge pull request #11 from lberger1993/BusMatching
kamolchanokTa Nov 8, 2017
ded4e63
Color change
Nov 8, 2017
32063e3
Merge pull request #12 from lberger1993/UI/mongo-add-accommodation
gabsanzsalas Nov 8, 2017
61c0fc2
Mock up Matching participant
kamolchanokTa Nov 8, 2017
c3bedbd
Merge pull request #13 from lberger1993/UI/Mockup-matching-participant
luciaeveberger Nov 9, 2017
9baab64
Merge branch 'master' of https://github.com/lberger1993/snowdays into…
grossetto Nov 10, 2017
41685f6
Get Accomodations
Nov 14, 2017
ee61952
Adds the bus zones with bulk import of data.
luciaeveberger Nov 16, 2017
a4cc295
fixes the collection to be called at all
luciaeveberger Nov 16, 2017
1163d28
Merge pull request #14 from lberger1993/buszones_creation
kamolchanokTa Nov 16, 2017
a2723ce
external setting of the step of the progress bar
grossetto Nov 16, 2017
d0f60de
Merge branch 'master' into BusMatching
Nov 20, 2017
35e206f
Adds foundations
luciaeveberger Nov 22, 2017
b31b43a
Call mapping eval method from the server initialy
Nov 22, 2017
6e346b8
fix load page
Nov 23, 2017
b91e06a
Correct buszone
Nov 23, 2017
70829e5
Update README.md
luciaeveberger Nov 23, 2017
eb67397
Merge branch 'master' into BusMatching
kamolchanokTa Nov 23, 2017
4625248
Merge pull request #15 from lberger1993/BusMatching
kamolchanokTa Nov 23, 2017
322fae4
Adds changes
luciaeveberger Nov 23, 2017
cf60838
Adds matching algorithm connection
luciaeveberger Nov 28, 2017
8e3ce1a
Merge branch 'master' into buszones_creation
luciaeveberger Nov 28, 2017
452f863
Add radio button for manually and auto assign for busZone in accommod…
kamolchanokTa Nov 28, 2017
0505530
Merge pull request #16 from lberger1993/buszones_creation
kamolchanokTa Nov 30, 2017
623693a
Update the table display matching result [add more npm i flat ]
kamolchanokTa Nov 30, 2017
940aaa4
Redesign the match page
kamolchanokTa Dec 7, 2017
3575d3c
adds second portion of the algorithm
luciaeveberger Dec 8, 2017
0d5e4da
Merge pull request #21 from lberger1993/syncs-algorithm-two-part
kamolchanokTa Dec 9, 2017
3f50942
Redesign the match page
kamolchanokTa Dec 7, 2017
6bb7792
Add CSV generate function (npm i downloadjs --save)
kamolchanokTa Dec 9, 2017
36ee9b5
Merge branch 'UI-WG-table-in-another-tab' of https://github.com/lberg…
kamolchanokTa Dec 9, 2017
8cad784
Merge pull request #17 from lberger1993/add-new-field-for-accommodation
luciaeveberger Dec 10, 2017
54152d1
Merge pull request #22 from lberger1993/UI-WG-table-in-another-tab
luciaeveberger Dec 10, 2017
c67a099
Adds better accomoddations
luciaeveberger Dec 10, 2017
02f2ea9
Merge branch 'master' into syncs-algorithm-two-part
luciaeveberger Dec 10, 2017
2f6ce8b
Adds actual route
luciaeveberger Dec 11, 2017
7e26ba6
Merge pull request #23 from lberger1993/syncs-algorithm-two-part
kamolchanokTa Dec 11, 2017
839c728
changes the formatting to ints
luciaeveberger Dec 12, 2017
8531ff3
Merge pull request #24 from lberger1993/syncs-algorithm-two-part
kamolchanokTa Dec 12, 2017
6d0b051
Merges differences in branch
luciaeveberger Mar 1, 2018
af07fe8
Merge branch 'mryraghi-master'
luciaeveberger Mar 1, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules/
.idea/workspace.xml
/.deploy/
.idea
20 changes: 0 additions & 20 deletions .idea/dictionaries/Romeo.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/encodings.xml

This file was deleted.

18 changes: 0 additions & 18 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/inspectionProfiles/profiles_settings.xml

This file was deleted.

3 changes: 1 addition & 2 deletions .idea/jsLibraryMappings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,884 changes: 941 additions & 943 deletions .idea/libraries/meteor_packages_auto_import_browser.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/preferred-vcs.xml

This file was deleted.

1 change: 1 addition & 0 deletions .idea/snowdays.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions .idea/typescript-compiler.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

30 changes: 0 additions & 30 deletions .idea/watcherTasks.xml

This file was deleted.

14 changes: 0 additions & 14 deletions .idea/webResources.xml

This file was deleted.

1 change: 1 addition & 0 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ simply:tether
froala:editor
dynamic-import@0.2.0
jquery@1.11.10
http
19 changes: 19 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,22 @@ Finally, we also implemented a detailed view of the participant including all th
- Romeo Bellon ([GitHub](https://github.com/mryraghi), [LinkedIn](https://www.linkedin.com/in/romeobellon/))
- Daniel Morandini ([GitHub](https://github.com/danielmorandini), [LinkedIn](https://www.linkedin.com/in/daniel-morandini-224a3586/))
- Alessandro Piccoli ([GitHub](https://github.com/alpicco))

# Getting Setup

clone repo and install meteor ([Meteor](https://www.meteor.com/install))

`cd snowdays && meteor npm install`

navigate to localhost:3000

# Seeing pages

`mongoimport --db meteor --collection users --file imports/data_seeds/users.json --jsonArray --port 3001`

`mongoimport --db meteor --collection participants --file imports/data_seeds/participants.json --jsonArray --port 3001`

`mongoimport --db meteor --collection accommodations --file imports/data_seeds/accommodations.json --jsonArray --port 3001`

`mongoimport --db meteor --collection buszones --file imports/data_seeds/buszone.json --jsonArray --port 3001`

121 changes: 121 additions & 0 deletions imports/collections/accommodations.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
import "babel-polyfill";
import SimpleSchema from "simpl-schema";
const Accommodations = new Mongo.Collection("accommodations");
const Schemas = {};

Schemas.Accommodation = new SimpleSchema({
_id: {
type: String,
regEx: SimpleSchema.RegEx.Id
},
name: {
type: String,
optional: true
},
address: {
type: String,
max: 30,
},
coordinates: {
type: String,
max: 30,
index: 1,
optional: true
},
busZone: {
type: String,
allowedValues: ['1', '2', '3'],
optional: true
},
isManuallyAssign: {
type: Boolean,
defaultValue: false,
optional: true
},
capacity: {
type: String,
max: 10,
optional: false
},
isWG: {
type: Boolean,
optional: true
},
history: {
type: Array,
optional: true,
autoValue: function () {
if (this.isUpdate) {
return {
$push: {
date: new Date,
updates: {}
}
};
} else {
this.unset(); // Prevent user from supplying their own value
}
}
},
'history.$': {
type: Object,
},
'history.$.date': {
type: Date,
optional: true
},
'history.$.updates': {
type: Object,
optional: true
},
'history.$.updates.field': {
type: String,
optional: true
},
'history.$.updates.value': {
type: String,
optional: true
},
token: {
type: String,
optional: true
},
statusComplete: {
type: Boolean,
label: '',
defaultValue: false,
optional: true
},
hasAcceptedTandC: {
type: Boolean,
defaultValue: false,
optional: true
},
createdAt: {
type: Date,
defaultValue: new Date(),
denyUpdate: true,
optional: true
},
updatedAt: {
type: Date,
autoValue: function () {
if (this.isUpdate) {
return new Date();
}
},
denyInsert: true,
optional: true
}
}, {
clean: {
filter: true,
autoConvert: true,
removeEmptyStrings: true,
trimStrings: true,
getAutoValues: true,
removeNullsFromArrays: true,
}
});
Accommodations.attachSchema(Schemas.Accommodation);
export default Accommodations;
Loading