Commit Graph
333 Commits
Author SHA1 Message Date
Monique b2d015dab8 Merge branch 'feature/labels' into develop 2023-07-03 12:19:39 +02:00
Monique d76bf98cf2 Merge branch 'feature/budgetmonfin' into feature/labels 2023-07-03 12:16:41 +02:00
Monique 4c1536e8b3 stappenplanBAO 2023-07-03 12:08:17 +02:00
Monique 89843a9f6c hoger kalenderjaar ivm budgettering 2023-06-30 13:43:06 +02:00
Monique 1480cd5a2f als restant 0 is leeg veld 2023-06-26 13:32:47 +02:00
Monique c26d3b2507 nog een test 2023-06-26 12:51:51 +02:00
Monique a3564ff048 if uitgezet 2023-06-26 12:47:41 +02:00
Monique e47f0a9a6c last result 2023-06-26 12:42:44 +02:00
Monique e0b2b12483 werkt dit beter 2023-06-26 12:36:02 +02:00
Monique 42fc2a64a2 order by uitgavetypes 2023-06-23 10:25:23 +02:00
Monique 440bd9ae06 Merge branch 'feature/budgetmonfin' into develop 2023-06-23 09:40:17 +02:00
Monique b9acce3072 totaalbudget verdelen 2023-06-22 16:25:31 +02:00
Monique 0afb3a9263 tussenstand 2023-06-19 17:38:26 +02:00
Monique f7adcfcc93 tussenopslag 2023-06-14 12:44:03 +02:00
Monique ac46447bea tussenopslag 2023-06-09 15:50:11 +02:00
Monique 8d46c0f2bc Merge branch 'feature/budgetmonfin' into develop 2023-04-28 13:59:48 +02:00
Monique 702c565674 wijziging toelichting 2023-04-28 13:57:50 +02:00
Monique fac8099373 Merge branch 'feature/budgetmonfin' into develop 2023-04-25 19:38:33 +02:00
Monique 1c22660e2e nog een 2023-04-25 19:38:21 +02:00
Monique 2110650762 Merge branch 'feature/budgetmonfin' into develop 2023-04-25 19:33:15 +02:00
Monique b046e57e09 procent teruggezet 2023-04-25 19:29:37 +02:00
Monique 714390aa67 precent in js teruggezet 2023-04-25 19:28:44 +02:00
Monique 857b43f236 Merge branch 'feature/budgetmonfin' into develop 2023-04-25 19:23:38 +02:00
Monique 747142a441 2 percentages verwijderd 2023-04-25 19:23:20 +02:00
Monique 60b577f279 Merge branch 'feature/budgetmonfin' into develop 2023-04-05 21:53:37 +02:00
Monique 236c949fc9 monfin 2023-04-05 21:53:21 +02:00
Monique 72f9e0691f Merge branch 'feature/budgetmonfin' into develop 2023-03-28 12:31:13 +02:00
Monique 8f67d09ba6 versie nog een keer hoger 2023-03-28 12:30:58 +02:00
Monique d87652bff7 Merge branch 'feature/budgetmonfin' into develop 2023-03-24 15:01:12 +01:00
Monique 4173dd2dc5 budgetteren in monfin 2023-03-24 15:00:04 +01:00
Monique fe1f210dd8 Merge branch 'feature/schooljaardiv' into develop 2023-02-27 09:44:54 +01:00
Monique d0b8914462 schooljaar erbij 2023-02-27 09:44:33 +01:00
Monique 3216bcb8ef Merge branch 'feature/schoolgegevensStdSOP' 2022-12-09 17:38:33 +01:00
Monique 5dc859adc6 Merge branch 'feature/schoolgegevensStdSOP' into develop 2022-12-09 17:34:52 +01:00
Monique 2bbfa82e46 COALESCE toegevoegd + lege databaseregel verwijderd 2022-12-09 17:34:01 +01:00
Monique fb6ef95d39 Merge branch 'fouten/kamerversiesbijambities' into develop 2022-12-09 16:31:57 +01:00
Monique 600de45445 orgversie swv 2022-12-09 16:31:45 +01:00
Monique dfb4d3579f Merge branch 'fouten/kamerversiesbijambities' into develop 2022-12-08 16:41:14 +01:00
Monique 0a9bf59d51 conrole op ambitie groter dan 0 verwijderd 2022-12-08 16:40:53 +01:00
Monique 05d22502d5 Merge branch 'fouten/kamerversiesbijambities' into develop
# Conflicts:
#	application/controllers/monpas/Streefcijfers.php
2022-12-06 22:03:57 +01:00
Monique d03944c77b iets mis gegaan met overzetten 2022-12-06 22:01:40 +01:00
Monique 77bfe72e1a fout met array in array 2022-12-06 08:41:36 +01:00
Monique ada9b88b98 streefcijfers 2022-12-05 17:11:59 +01:00
Monique 27d03b22ea Merge branch 'fouten/kamerversiesbijambities' into develop 2022-12-05 17:10:02 +01:00
Monique ab41e2d975 helpt dit 2022-12-05 17:09:50 +01:00
Monique 1c6fbb0aa8 Merge branch 'fouten/kamerversiesbijambities' into develop
# Conflicts:
#	application/controllers/monpas/Streefcijfers.php
2022-12-05 17:02:08 +01:00
Monique ab7ab4ae32 kamers apart 2022-12-05 17:01:14 +01:00
Monique 4b1060251b teveel ijkpunten geteld 2022-12-05 14:13:43 +01:00
Monique 4eae062550 Merge branch 'fouten/kamerversiesbijambities' into develop
# Conflicts:
#	public/js/monpas/models/streefcijfersmodel.js
2022-12-05 14:00:14 +01:00
Monique 2fc78b7265 score 0 opslaan 2022-12-05 13:58:57 +01:00