resolve cardset issues

imports/api/cardsets.js

@@ -39,9 +39,6 @@ const CardsetsSchema = new SimpleSchema({
 	name: {
 		type: String
 	},
-	category: {
-		type: String
-	},
 	description: {
 		type: String
 	},
@@ -54,9 +51,6 @@ const CardsetsSchema = new SimpleSchema({
 	owner: {
 		type: String
 	},
-	username: {
-		type: String
-	},
 	visible: {
 		type: Boolean
 	},
@@ -93,16 +87,13 @@ const CardsetsSchema = new SimpleSchema({
 	userDeleted: {
 		type: Boolean
 	},
-	modulLong: {
-		type: String
-	},
-	modulShort: {
+	module: {
 		type: String
 	},
-	modulNum: {
+	moduleToken: {
 		type: String
 	},
-	lastName: {
+	moduleNum: {
 		type: String
 	},
 	degree: {
@@ -111,20 +102,11 @@ const CardsetsSchema = new SimpleSchema({
 	college: {
 		type: String
 	},
-	academicCourse: {
-		type: String
-	},
 	department: {
 		type: String
 	},
 	studyType: {
 		type: String
-	},
-	BachelorOrMaster: {
-		type: String
-	},
-	semester: {
-		type: String
 	}
 });
 
@@ -177,7 +159,6 @@ Meteor.methods({
 			date: new Date(),
 			dateUpdated: new Date(),
 			owner: Meteor.userId(),
-			firstName: Meteor.user().profile.name,
 			visible: visible,
 			ratings: ratings,
 			kind: kind,
@@ -189,17 +170,13 @@ Meteor.methods({
 			quantity: 0,
 			license: [],
 			userDeleted: false,
-			modulLong: modulLong,
-			modulShort: modulShort,
-			modulNum: modulNum,
-			lastName: 'undefined',
+			module: modulLong,
+			moduleToken: modulShort,
+			moduleNum: modulNum,
 			degree: nameTitle,
 			college: college,
-			academicCourse: 'undefined',
 			department: 'undefined',
-			studyType: studyType,
-			BachelorOrMaster: 'undefined',
-			semester: 'undefined'
+			studyType: studyType
 		});
 		Experience.insert({
 			type: 2,
@@ -245,9 +222,9 @@ Meteor.methods({
 				name: name,
 				description: description,
 				dateUpdated: new Date(),
-				modulLong: modulLong,
-				modulShort: modulShort,
-				modulNum: modulNum
+				module: modulLong,
+				moduleToken: modulShort,
+				moduleNum: modulNum
 			}
 		});
 	},

imports/ui/cardset/cardset.html

@@ -70,9 +70,9 @@
                         <strong>{{_ "cardset.info.quantity"}}:</strong> {{this.quantity}}
                         <br><strong id="license_strong">{{_ "cardset.info.license"}}:</strong>
                         <span id="info_license">{{getLicense}}</span>
-                        <br><strong>{{_ "cardset.info.modulLong"}}:</strong> {{this.modulLong}}
-                        <br><strong>{{_ "cardset.info.modulShort"}}:</strong> {{this.modulShort}}
-                        <br><strong>{{_ "cardset.info.modulNum"}}:</strong> {{this.modulNum}}
+                        <br><strong>{{_ "cardset.info.modulLong"}}:</strong> {{this.module}}
+                        <br><strong>{{_ "cardset.info.modulShort"}}:</strong> {{this.moduleToken}}
+                        <br><strong>{{_ "cardset.info.modulNum"}}:</strong> {{this.moduleNum}}
                         <br><strong>{{_ "cardset.info.college"}}:</strong> {{this.college}}
                         <br><strong>{{_ "cardset.info.studyType"}}:</strong> {{this.studyType}}
                         <br><strong>{{_ "cardset.info.author"}}:</strong>
@@ -391,7 +391,7 @@
                                        for="editSetModulLong">{{_ "modal-dialog.modulLong"}}</label>
                                 <div class="col-md-9">
                                     <input class="form-control" type="text" id="editSetModulLong"
-                                           value="{{modulLong}}">
+                                           value="{{module}}">
                                     <span id="helpEditSetModulLong" class="help-block name"></span>
                                 </div>
                             </div><!-- / module textfield -->
@@ -401,7 +401,7 @@
                                        for="editSetModulShort">{{_ "modal-dialog.modulShort"}}</label>
                                 <div class="col-md-9">
                                     <input class="form-control" type="text" id="editSetModulShort"
-                                           value="{{modulShort}}">
+                                           value="{{moduleToken}}">
                                     <span id="helpEditSetModulShort" class="help-block name"></span>
                                 </div>
                             </div><!-- / module textfield -->
@@ -411,7 +411,7 @@
                                        for="editSetModulNum">{{_ "modal-dialog.modulNum"}}</label>
                                 <div class="col-md-9">
                                     <input class="form-control" type="text" id="editSetModulNum"
-                                           value="{{modulNum}}">
+                                           value="{{moduleNum}}">
                                     <span id="helpEditSetModulNum" class="help-block name"></span>
                                 </div>
                             </div><!-- / module textfield -->

imports/ui/cardsets/cardsets.js

@@ -172,7 +172,6 @@ Template.cardsets.events({
 		}
 		if ($('#newSetName').val() !== "" &&
 			$('#newSetDescription').val() !== "" &&
-			$('#newSetCategory').val() !== "" &&
 			$('#newSetModulLong').val() !== "" &&
 			$('#newSetModulShort').val() !== "" &&
 			$('#newSetModulNum').val() !== "" &&

settings.json

@@ -21,7 +21,7 @@
     "BT_PRIVATE_KEY": "b508f71a0e0b01940b0fbe75940debb9"
   },
   "admin": {
-    "name": "ylhn15"
+    "name": "atgt64"
   },
   "facebook": {
     "api": "162760697401847",