Skip to content

Commit 95037f7

Browse files
authored
Merge pull request cyclic-software#24 from royyan005/local
add angka mutu final
2 parents ce35f83 + 2f35e8f commit 95037f7

File tree

3 files changed

+51
-2
lines changed

3 files changed

+51
-2
lines changed

controller/form.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,13 @@ export const deleteMatkul = async (req, res) => {
812812
})
813813

814814
const deleteipk = await Mahasiswa.update({
815-
ipk: null
815+
ipk: null,
816+
am1: null,
817+
am2: null,
818+
am3: null,
819+
am4: null,
820+
am5: null,
821+
am6: null,
816822
}, {
817823
where: {
818824
id: req.params.idmahasiswa

controller/mahasiswa.js

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,12 @@ export const updateIpkMahasiswa = async (req, res) => {
531531
}
532532

533533
var ipk = 0.0
534+
var am1 = 0.0
535+
var am2 = 0.0
536+
var am3 = 0.0
537+
var am4 = 0.0
538+
var am5 = 0.0
539+
var am6 = 0.0
534540

535541
try {
536542
const matkul1pembimbing1 = await Matkul1.findAll({
@@ -677,6 +683,19 @@ export const updateIpkMahasiswa = async (req, res) => {
677683
})
678684
if (!matkul6penguji) return err
679685

686+
const totalam1 = ((0.4 * matkul1pembimbing1[0].angkamutu) + (0.4 * matkul1pembimbing2[0].angkamutu) + (0.3 * matkul1penguji[0].angkamutu))
687+
const totalam2 = ((0.4 * matkul2pembimbing1[0].angkamutu) + (0.4 * matkul2pembimbing2[0].angkamutu) + (0.3 * matkul2penguji[0].angkamutu))
688+
const totalam3 = ((0.4 * matkul3pembimbing1[0].angkamutu) + (0.4 * matkul3pembimbing2[0].angkamutu) + (0.3 * matkul3penguji[0].angkamutu))
689+
const totalam4 = ((0.4 * matkul4pembimbing1[0].angkamutu) + (0.4 * matkul4pembimbing2[0].angkamutu) + (0.3 * matkul4penguji[0].angkamutu))
690+
const totalam5 = ((0.4 * matkul5pembimbing1[0].angkamutu) + (0.4 * matkul5pembimbing2[0].angkamutu) + (0.3 * matkul5penguji[0].angkamutu))
691+
const totalam6 = ((0.4 * matkul6pembimbing1[0].angkamutu) + (0.4 * matkul6pembimbing2[0].angkamutu) + (0.3 * matkul6penguji[0].angkamutu))
692+
am1 = totalam1/3
693+
am2 = totalam2/3
694+
am3 = totalam3/3
695+
am4 = totalam4/3
696+
am5 = totalam5/3
697+
am6 = totalam6/3
698+
680699
const totalskspembimbing1 = matkul1pembimbing1[0].sks + matkul2pembimbing1[0].sks + matkul3pembimbing1[0].sks + matkul4pembimbing1[0].sks + matkul5pembimbing1[0].sks + matkul6pembimbing1[0].sks
681700
const totalnilaimutupembimbing1 = matkul1pembimbing1[0].nilaimutu + matkul2pembimbing1[0].nilaimutu + matkul3pembimbing1[0].nilaimutu + matkul4pembimbing1[0].nilaimutu + matkul5pembimbing1[0].nilaimutu + matkul6pembimbing1[0].nilaimutu
682701
const totalskspembimbing2 = matkul1pembimbing2[0].sks + matkul2pembimbing2[0].sks + matkul3pembimbing2[0].sks + matkul4pembimbing2[0].sks + matkul5pembimbing2[0].sks + matkul6pembimbing2[0].sks
@@ -694,7 +713,13 @@ export const updateIpkMahasiswa = async (req, res) => {
694713

695714
try {
696715
const updateMahasiswa = await Mahasiswa.update({
697-
ipk: ipk
716+
ipk: ipk,
717+
am1: am1,
718+
am2: am2,
719+
am3: am3,
720+
am4: am4,
721+
am5: am5,
722+
am6: am6,
698723
}, {
699724
where: {
700725
id: idmahasiswa

models/mahasiswa.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,24 @@ const Mahasiswa = db.define('mahasiswas',{
3333
},
3434
ipk: {
3535
type: Float32Array,
36+
},
37+
am1: {
38+
type: Float32Array,
39+
},
40+
am2: {
41+
type: Float32Array,
42+
},
43+
am3: {
44+
type: Float32Array,
45+
},
46+
am4: {
47+
type: Float32Array,
48+
},
49+
am5: {
50+
type: Float32Array,
51+
},
52+
am6: {
53+
type: Float32Array,
3654
}
3755
});
3856

0 commit comments

Comments
 (0)