Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121 Commits 3 Branches 0 Tags
b12ca62443bc3b3b141c6fe3ec319de15b450a91
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Monique b12ca62443 fout als aanta lln 0 is 2022-01-24 13:20:44 +01:00
Monique b8b071f338 printknop tijdelijk uit 2022-01-24 12:14:00 +01:00
Monique 5df408abd2 Merge branch 'fouten/compactsopdivmeters' 2022-01-04 12:41:52 +01:00
Monique e2bf58f626 divblokje 2022-01-04 12:40:35 +01:00
Monique b889f521c2 versie 2022-01-04 12:03:39 +01:00
Monique a479aa6e65 titel en header sop 2022-01-04 11:53:53 +01:00
Monique 19d3b7154e titel en header sops 2022-01-04 11:50:14 +01:00
Monique 120784e169 versie 2022-01-03 18:31:02 +01:00
Monique 15d48f0699 Merge branch 'fouten/compactsopdivmeters' into develop 2022-01-03 18:28:45 +01:00
Monique aebac20e0a blokje in goed formaat 2022-01-03 18:28:12 +01:00
Monique bef604a03e versie 2022-01-03 12:17:50 +01:00
Monique 9aa92ea64a Merge branch 'feature/sophome' into develop 2022-01-03 12:15:30 +01:00
Monique 47bd7ac76d zichtbaarheid paginas 2022-01-03 12:15:03 +01:00
Monique b9407fb118 overzicht 2021-12-20 17:26:35 +01:00
Monique e445e56365 vermelding overzicht 2021-12-20 17:14:52 +01:00
Monique 0ce83d1578 haakje teveel 2021-12-20 17:10:10 +01:00
Monique b9b77d8384 Merge branch 'feature/sophome' into develop 
# Conflicts:
#	application/core/MY_Controller.php
#	application/views/monpas/pages/sophome.php
#	public/js/monpas/models/sophomemodel.js
 2021-12-20 17:08:40 +01:00
Monique 0d479218fe homebopropswop 2021-12-20 17:02:06 +01:00
Monique 2930478074 tussenstand 2021-12-20 16:56:17 +01:00
Monique e0c723db65 linkjes naar soponderdelen 2021-12-20 11:56:49 +01:00
Monique fcb17cc932 Merge branch 'feature/sophome' into develop 2021-12-20 11:07:47 +01:00
Monique 9a6240f98b versie 2021-12-20 11:06:58 +01:00
Monique b92fed96c0 homepage voor scholen 2021-12-20 11:06:27 +01:00
Monique a1d43b1ea5 Merge branch 'feature/sophome' into develop 
# Conflicts:
#	application/core/MY_Controller.php
 2021-12-14 21:50:55 +01:00
Monique 79a3e20dc5 homepage sop voor scholen 2021-12-14 21:49:35 +01:00
Monique fbe63d1528 Merge branch 'toelichtinghomescan' into develop 2021-12-14 13:18:08 +01:00
Monique 45062bae32 Merge branch 'feature/yasgrafiekdivmeter' into develop 
# Conflicts:
#	application/core/MY_Controller.php
 2021-12-14 13:15:57 +01:00
Monique 1a52f3b018 versie 2021-12-14 13:14:16 +01:00
Monique 45902fc995 bijlage 2021-12-14 12:55:41 +01:00
Monique 74177cc809 Merge branch 'feature/yasgrafiekdivmeter' into develop 2021-12-14 12:14:28 +01:00
Monique e4e8e29254 tussenstand 2021-12-14 12:10:30 +01:00
Monique 26d73e1c6d Merge branch 'fouten/bestemmingennatoewijzing' into develop 2021-12-13 11:04:58 +01:00
Monique 016a1490a0 Bestemmingen alleen invullen als er een budget is 
knockout was een object ipv een boolean
 2021-12-13 11:03:52 +01:00
Monique ffa90c8dc6 Merge branch 'feature/foutmatrix' into develop 
# Conflicts:
#	application/core/MY_Controller.php
 2021-12-09 23:01:33 +01:00
Monique d8330d42a2 fouten matrix indiiduele scores 2021-12-09 23:00:44 +01:00
Monique a15dd94a81 disabled 2021-12-09 22:19:28 +01:00
Monique ed6980443a foutje 2021-12-09 18:13:35 +01:00
Monique 002d448f02 versie 2021-12-09 18:10:25 +01:00
Monique dd77f82aa1 Merge branch 'feature/foumatrix' into develop 
# Conflicts:
#	application/core/MY_Controller.php
 2021-12-09 18:07:23 +01:00
Monique 9c56cc1784 verkeerde argument in functie 2021-12-09 18:04:19 +01:00
Monique 1187e35ce8 verkeerde variabele in functie 2021-12-09 17:54:59 +01:00
Monique 63d85ab257 foutje 2021-12-09 17:08:25 +01:00
Monique 17bd74650b versie 2021-12-09 16:59:08 +01:00
Monique 581f44b520 Merge branch 'feature/yasgrafiekdivmeter' into develop 2021-12-09 16:47:51 +01:00
Monique 9272459c9f 2 varianten grafiek met variabele yas 2021-12-09 16:47:36 +01:00
Monique 687538d236 Merge branch 'feature/clusterScans' into develop 
# Conflicts:
#	application/core/MY_Controller.php
 2021-12-09 10:26:38 +01:00
Monique ba916e9ef1 cluster scans pssend onderwijs 2021-12-09 10:25:57 +01:00
Monique ab091c888e Merge branch 'feature/disable3' 2021-11-25 09:01:07 +01:00
Monique 7a9e36cbe1 volgorde orgs 2021-11-25 08:38:20 +01:00
Monique 033b960ab5 Merge branch 'feature/disable3' 
# Conflicts:
#	application/core/MY_Controller.php
 2021-11-24 21:47:54 +01:00
Monique 9773fe94d5 Merge branch 'feature/disable3' into develop 
# Conflicts:
#	application/core/MY_Controller.php
 2021-11-23 17:36:51 +01:00
Monique ccc3ae6dfd resultaamatrix 2021-11-23 17:35:58 +01:00
Monique 0f53130309 Merge branch 'develop' 2021-11-22 11:44:02 +01:00
Monique 5b5edb1f6c versie 2021-11-22 11:04:41 +01:00
Monique b9b585f762 gemiddelde matrix 2021-11-22 10:27:52 +01:00
Monique 7ea12a20ed sops 2021-11-19 22:47:25 +01:00
Monique 39a120e214 flexibel sop 2021-11-19 19:59:34 +01:00
Monique b8177ade48 tussenstand 2021-11-19 10:31:31 +01:00
Monique ed0ca50d6d Compact Sop 2021-11-18 15:02:11 +01:00
Monique bdf313ae64 ijkpunten & ontwikelagenda 2021-11-18 14:15:47 +01:00
Monique 0f5cea83db getdisabled 2021-11-16 21:57:20 +01:00
Monique af3d32b653 ijkpunten 2021-11-16 21:40:12 +01:00
Monique 2db90688a6 tussenopslag 2021-11-16 13:46:11 +01:00
Monique a9a63c2476 tussenstand 2021-11-16 13:16:15 +01:00
Monique 62d7a73c85 tussenopslag 2021-11-16 12:40:06 +01:00
Monique ff2ca0e5d1 update scoresmodel 2021-11-16 11:22:42 +01:00
Monique 939e7f69ac tussenopslag 2021-11-16 11:16:52 +01:00
Monique eb0bd12ac8 printfunctie bij invullen uitgezet 2021-10-29 15:51:19 +02:00
Monique 1a324bde5d knockoutmetingen 2021-10-15 13:55:43 +02:00
Monique de1ad17d0a queryfout 2021-10-15 13:02:59 +02:00
Monique 494ddc410d Merge branch 'feature/benamingDivpo22003' into develop 2021-10-12 14:26:49 +02:00
Monique 19ee286c71 benaming tabblad diversiteit 2021-10-12 14:26:29 +02:00
Monique be51b92f12 versie en consoles 2021-10-08 14:01:33 +02:00
Monique 880647f310 geenondersteuning so en sbo 2021-10-08 13:49:46 +02:00
Monique 057d721bd8 tussenopslag 2021-10-08 12:52:42 +02:00
Monique 129a222506 versie 2021-09-27 17:46:31 +02:00
Monique ea46900067 invullen 0 waarden aantal tlvs 2021-09-27 17:45:05 +02:00
Monique 7224b112d6 datetomysql 2021-09-27 10:24:08 +02:00
Monique a7fdbad581 versie verhogen 2021-09-24 14:19:47 +02:00
Monique f19d724c51 titel evt leeg 2021-09-24 12:48:12 +02:00
Monique 5e64d80181 default 2021-09-24 12:41:45 +02:00
Monique 87820c5131 Merge branch 'feature/robbobswop' 2021-09-24 12:29:11 +02:00
Monique 66c9d1305c spelfout + wijziging titel 2021-09-24 12:27:49 +02:00
Monique 243681fef6 Merge branch 'develop' into feature/robbobswop 2021-09-24 11:56:19 +02:00
Monique 7d214fa4c3 typefout 2021-09-24 11:53:23 +02:00
Monique f9fab9a853 typefout 2021-09-24 11:51:59 +02:00
Monique 938f8614ea versie verhoogd 2021-09-24 11:18:10 +02:00
Monique bced4426c0 Merge branch 'feature/robbobswop' into develop 2021-09-20 12:47:09 +02:00
Monique 154932014c chartid expertise so anders regulier 2021-09-20 12:46:57 +02:00
Monique ec53a23220 Merge branch 'feature/robbobswop' into develop 2021-09-16 18:45:02 +02:00
Monique efac256497 versie 2021-09-16 18:44:50 +02:00
Monique 598f4e5084 nav 1e test 2021-09-16 18:42:51 +02:00
Monique 8c1d92f99b tussenopslag 2021-09-16 10:17:57 +02:00
Monique 90faa2ec4f tonen swvoverzicht sop 2021-09-09 19:48:20 +02:00
Monique 0bf281fba1 Merge branch 'feature/robbobswop' into develop 2021-09-07 14:33:35 +02:00
Monique e5ce60f214 fout query compacte onderdelen 2021-09-07 14:33:23 +02:00
Monique 1ed87d3d5f Merge branch 'feature/robbobswop' into develop 2021-09-07 10:29:38 +02:00
Monique 92175d82b2 mappen 2021-09-07 10:29:26 +02:00
Monique 4c9eb6a4fd sopBobRopSwop en divmeter voor po2203 in compact sop 2021-09-07 10:28:28 +02:00
Monique 29b45411b4 Merge branch 'master' into feature/robbobswop 
# Conflicts:
#	application/libraries/monpas/compactsop/Compacteonderdelen.php
 2021-09-03 21:30:11 +02:00