Skip to content

Commit c556bf0

Browse files
committed
Altered database & removed/changed some things
predmetShema -> added unique tag to "ime" and added an atribute "kraticaPredmeta". Removed unnecesary flairs in "predmet.component.html"
1 parent db7cb2b commit c556bf0

File tree

5 files changed

+11
-23
lines changed

5 files changed

+11
-23
lines changed

app_api/models/predmet.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ const gradivoShema = new mongoose.Schema({
192192
*/
193193

194194
const predmetShema = new mongoose.Schema({
195-
ime: {type: String},
195+
ime: {type: String, unique: true},
196196
opis: {type: String},
197197
// 0 -> ni v letniku a, 1 -> 1. letnik...
198198
letnik: {type: Number},
@@ -215,7 +215,8 @@ const predmetShema = new mongoose.Schema({
215215
gradiva: [{
216216
type: mongoose.Schema.Types.ObjectId,
217217
ref: 'Gradivo'
218-
}]
218+
}],
219+
kraticaPredmeta:{type: String, unique:true}
219220
});
220221

221222
/**

app_public/build/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
<noscript>Please enable JavaScript to continue using this application.</noscript>
2323
<script src="./assets/public/js/jquery-3.5.1.min.js"></script>
2424
<script src="./assets/public/js/bootstrap.bundle.min.js"></script>
25-
<script src="runtime.7b63b9fd40098a2e8207.js" defer></script><script src="polyfills.48c2cf7043c03bf6ac83.js" defer></script><script src="main.a65e3802f5f8c574907e.js" defer></script></body>
25+
<script src="runtime.7b63b9fd40098a2e8207.js" defer></script><script src="polyfills.48c2cf7043c03bf6ac83.js" defer></script><script src="main.fff48111f6a5eeb47220.js" defer></script></body>
2626
</html>

app_public/build/main.a65e3802f5f8c574907e.js renamed to app_public/build/main.fff48111f6a5eeb47220.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app_public/build/ngsw.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"configVersion": 1,
3-
"timestamp": 1619179177055,
3+
"timestamp": 1622284841060,
44
"index": "/index.html",
55
"assetGroups": [
66
{
@@ -13,7 +13,7 @@
1313
"urls": [
1414
"/favicon.ico",
1515
"/index.html",
16-
"/main.a65e3802f5f8c574907e.js",
16+
"/main.fff48111f6a5eeb47220.js",
1717
"/manifest.webmanifest",
1818
"/polyfills.48c2cf7043c03bf6ac83.js",
1919
"/runtime.7b63b9fd40098a2e8207.js",
@@ -139,8 +139,8 @@
139139
"/assets/public/webfonts/fa-solid-900.woff": "3b86a0ce15d8d534b65e98560e321a933d310688",
140140
"/assets/public/webfonts/fa-solid-900.woff2": "9b592048b9062b00f0b2dd782d70a95b7dc69b83",
141141
"/favicon.ico": "22f6a4a3bcaafafb0254e0f2fa4ceb89e505e8b2",
142-
"/index.html": "7867487ea2782e419c667a587af76727dbdcbeab",
143-
"/main.a65e3802f5f8c574907e.js": "6df35b9a2bd2c61935b900b513c883c96048e90b",
142+
"/index.html": "38212a5144b99018ca406c261e415f3fc21e636c",
143+
"/main.fff48111f6a5eeb47220.js": "70b0a6ba22ca02bd254c0e112957f8b2c8edb171",
144144
"/manifest.webmanifest": "fc5e93aeedf24480fda7d301467626b930dca61a",
145145
"/polyfills.48c2cf7043c03bf6ac83.js": "2116a5df20eec4ad4ed41ec4b01aa93e3af1eda4",
146146
"/runtime.7b63b9fd40098a2e8207.js": "a9aafcf49f49145093fc831efd9b8e2f6c71bb9c",

app_public/src/app/skupno/komponente/predmet/predmet.component.html

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,13 @@
1515
<p class="mt-3 ml-1">{{predmet.opis}}</p>
1616
<div>
1717
<a *ngFor="let profesor of predmet.profesorji" class="btn btn-profesor rounded m-1" (click)="openOsebje(profesor._id)">Profesor | {{profesor.ime_priimek}}<i class="fas fa-external-link-alt ml-2"></i></a>
18-
<a *ngFor="let asistent of predmet.asistenti" class="btn btn-asistent rounded m-1" (click)="openOsebje(asistent._id)">Asistent | {{asistent.ime_priimek}}<i class="fas fa-external-link-alt ml-2"></i></a>
19-
20-
<div *ngIf="predmet.letnik > 0" class="btn btn-letnik rounded m-1">Letnik | {{predmet.letnik | formatirajLetnik}}</div>
21-
22-
<div class="btn btn-semester rounded m-1">Semester | {{predmet.semester | formatirajSemester}}</div>
23-
24-
<div *ngIf="predmet.vrstaIzbirnega && predmet.vrstaIzbirnega != 0" class="btn btn-tip rounded m-1">Tip | {{predmet.vrstaIzbirnega | formatirajTipIzbirnega}}</div>
25-
<ng-container *ngIf="!predmet.vrstaIzbirnega || predmet.vrstaIzbirnega == 0">
26-
<div *ngIf="predmet.moduli.length == 0" class="btn btn-tip rounded m-1">Tip | Obvezni predmet</div>
27-
<div *ngIf="predmet.moduli.length > 0" class="btn btn-tip rounded m-1">Tip | Modulski predmet</div>
28-
</ng-container>
29-
30-
<div *ngFor="let modul of predmet.moduli" class="btn btn-modul rounded m-1">Modul | {{modul.ime}}</div>
31-
</div>
18+
<a *ngFor="let asistent of predmet.asistenti" class="btn btn-asistent rounded m-1" (click)="openOsebje(asistent._id)">Asistent | {{asistent.ime_priimek}}<i class="fas fa-external-link-alt ml-2"></i></a>
19+
</div>
3220
</div>
3321
<!--dokumenti-->
3422
<app-predmet-gradiva [(predmet)]="predmet"></app-predmet-gradiva>
3523
</div>
3624
</div>
37-
3825
<ng-template #niPredmeta>
3926
<div style="margin-top:10px" class="alert alert-warning" role="alert">
4027
Nalagam predmet

0 commit comments

Comments
 (0)