Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
cards
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Sergej Lopatin
cards
Commits
325c7f2b
Commit
325c7f2b
authored
Sep 14, 2016
by
Adrian Guthmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resolve cardset issues
parent
796ab4bb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
41 deletions
+17
-41
cardsets.js
imports/api/cardsets.js
+10
-33
cardset.html
imports/ui/cardset/cardset.html
+6
-6
cardsets.js
imports/ui/cardsets/cardsets.js
+0
-1
settings.json
settings.json
+1
-1
No files found.
imports/api/cardsets.js
View file @
325c7f2b
...
...
@@ -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
},
modul
Num
:
{
modul
eToken
:
{
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
(),
modul
Long
:
modulLong
,
modul
Short
:
modulShort
,
modulNum
:
modulNum
modul
e
:
modulLong
,
modul
eToken
:
modulShort
,
modul
e
Num
:
modulNum
}
});
},
...
...
imports/ui/cardset/cardset.html
View file @
325c7f2b
...
...
@@ -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.modul
Long
}}
<br><strong>
{{_ "cardset.info.modulShort"}}:
</strong>
{{this.modul
Short
}}
<br><strong>
{{_ "cardset.info.modulNum"}}:
</strong>
{{this.modulNum}}
<br><strong>
{{_ "cardset.info.modulLong"}}:
</strong>
{{this.modul
e
}}
<br><strong>
{{_ "cardset.info.modulShort"}}:
</strong>
{{this.modul
eToken
}}
<br><strong>
{{_ "cardset.info.modulNum"}}:
</strong>
{{this.modul
e
Num}}
<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=
"{{modul
Long
}}"
>
value=
"{{modul
e
}}"
>
<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=
"{{modul
Short
}}"
>
value=
"{{modul
eToken
}}"
>
<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=
"{{modul
e
Num}}"
>
<span
id=
"helpEditSetModulNum"
class=
"help-block name"
></span>
</div>
</div>
<!-- / module textfield -->
...
...
imports/ui/cardsets/cardsets.js
View file @
325c7f2b
...
...
@@ -172,7 +172,6 @@ Template.cardsets.events({
}
if
(
$
(
'
#newSetName
'
).
val
()
!==
""
&&
$
(
'
#newSetDescription
'
).
val
()
!==
""
&&
$
(
'
#newSetCategory
'
).
val
()
!==
""
&&
$
(
'
#newSetModulLong
'
).
val
()
!==
""
&&
$
(
'
#newSetModulShort
'
).
val
()
!==
""
&&
$
(
'
#newSetModulNum
'
).
val
()
!==
""
&&
...
...
settings.json
View file @
325c7f2b
...
...
@@ -21,7 +21,7 @@
"BT_PRIVATE_KEY"
:
"b508f71a0e0b01940b0fbe75940debb9"
},
"admin"
:
{
"name"
:
"
ylhn15
"
"name"
:
"
atgt64
"
},
"facebook"
:
{
"api"
:
"162760697401847"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment