Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
279 commits
Select commit Hold shift + click to select a range
8ace33b
new designs - improved user experience
OmondiKevin Nov 13, 2015
fb0941b
Merge commit '9055924161c1f318c4c62f9e35b2a10b9c5cbe3e'
victoriawasonga Nov 18, 2015
1b52f4c
Merge commit 'e46ee2c1ff06e4deaec446727e5046c2981384e9'
victoriawasonga Nov 18, 2015
fa8ddd5
new design
OmondiKevin Nov 20, 2015
dae0e97
Merge remote-tracking branch 'victoria/master'
OmondiKevin Nov 23, 2015
ec1dca5
MPDF Update. New Version 6
OmondiKevin Nov 23, 2015
6e888c7
latest updates
OmondiKevin Dec 3, 2015
7f9692c
updated patients' view. DON'T MERGE
OmondiKevin Dec 5, 2015
c3981c0
update of automanagement
OmondiKevin Dec 18, 2015
467105f
fmap template update
OmondiKevin Jan 6, 2016
f49c60d
Added positive adjustments.
sheilanasimiyu Jan 6, 2016
ee40834
Merge branch 'master' of https://github.com/sheilanasimiyu/ADT
OmondiKevin Jan 6, 2016
0f5dedb
merge cdrr
OmondiKevin Jan 6, 2016
7df6702
Regimen and update changes
OmondiKevin Jan 13, 2016
313a56c
new procedures to add new rows to the sync {regimen category}
OmondiKevin Jan 13, 2016
1f4d812
Added source column on visiting patients.
sheilanasimiyu Jan 14, 2016
d73861d
New procedures, New design
OmondiKevin Jan 18, 2016
138caf7
updated procedures. validate tables
OmondiKevin Jan 26, 2016
18197ea
Merge remote-tracking branch 'sheila/master'
OmondiKevin Jan 26, 2016
4907669
enhancement of off campus access
OmondiKevin Jan 28, 2016
68afa52
changes in order module
OmondiKevin Jan 29, 2016
9df04df
new arrays for fmaps. Progress
OmondiKevin Jan 29, 2016
1cb20c4
new maps view. not final
OmondiKevin Jan 29, 2016
05c011b
updated view and js
OmondiKevin Jan 29, 2016
acbfcd7
changed f_map template and new config git file
OmondiKevin Jan 29, 2016
d466476
arrays and procedures modifies
OmondiKevin Feb 1, 2016
ff2b743
Updated procedures
OmondiKevin Feb 1, 2016
2a8e321
filter function on the patients.
OmondiKevin Feb 11, 2016
375446a
ob_start() functions
OmondiKevin Feb 12, 2016
0b73b14
Buffer in dispensement controller
OmondiKevin Feb 13, 2016
610f991
Added Patients on isoniazid in reports.
sheilanasimiyu Feb 19, 2016
aac6442
Viral load
webadtknh Feb 20, 2016
86a4ded
no major changes
OmondiKevin Feb 29, 2016
6c1f97b
update tables with procedures
OmondiKevin Mar 7, 2016
fd3c9ed
updated procedure
OmondiKevin Mar 7, 2016
3f70066
updated function
OmondiKevin Mar 8, 2016
e1128ee
database adjustments
OmondiKevin Mar 10, 2016
67b2d97
update tables Complete. Version added.
OmondiKevin Mar 14, 2016
497142c
new changes
OmondiKevin Mar 17, 2016
4c968d6
updates for regimen_category
OmondiKevin Mar 18, 2016
6ea62aa
new modal created for updating the Db tables
OmondiKevin Mar 21, 2016
329e85e
updates function finished. Complete. No bugs!!
OmondiKevin Mar 21, 2016
7fa9b4a
updates cleaned up
OmondiKevin Mar 21, 2016
f7a475e
auto version template
OmondiKevin Mar 22, 2016
95266a7
cdrr updates. non - Complete
OmondiKevin Mar 23, 2016
137667d
cdrr cleaned to show relevant data
OmondiKevin Mar 23, 2016
22c14de
latest updates on order
OmondiKevin Mar 29, 2016
e73a4af
updates from victor
OmondiKevin Mar 29, 2016
6587ae9
updated patient's management
OmondiKevin Mar 29, 2016
1a33606
cdrr packsize corrected
OmondiKevin Apr 1, 2016
91f6cc6
Isoniazid report updated.
victoriawasonga Apr 13, 2016
1feecd8
cache
OmondiKevin Apr 15, 2016
1308c96
die removed
OmondiKevin Apr 15, 2016
40b8fbd
OI regimen incomplete
victoriawasonga Apr 27, 2016
9bf9fff
updates
OmondiKevin Apr 29, 2016
0edef8a
Merge remote-tracking branch 'victoria/version_2.0' into release/v.3.0.2
OmondiKevin Apr 29, 2016
2b3a9d8
Drug Prophylaxis complete
OmondiKevin Apr 29, 2016
8b9356b
code clean up
OmondiKevin Apr 29, 2016
d76a9af
updates on the OI regimen
victoriawasonga May 3, 2016
43d78f5
viral load
OmondiKevin May 3, 2016
71921a5
Prophylaxis filtering only active patient
victoriawasonga May 4, 2016
1e23b1e
Merge remote-tracking branch 'victoria/release/v.3.0.2' into release/…
OmondiKevin May 4, 2016
22a9769
report management error fixed
OmondiKevin May 5, 2016
e8606c1
ADT IQCare intergration files
victoriawasonga May 18, 2016
417443b
change from D-CDRR to D-MAP on order module login page
victoriawasonga May 26, 2016
9b53610
Date between isonizid start date and end date changed to 180 from 169
victoriawasonga May 26, 2016
8a58be0
MOH 731 form corrected to allow generation
victoriawasonga Jun 3, 2016
9e24226
new changes
Jun 30, 2016
ca399db
Ask if Patient is Pregnant when they are Female and above 14 years
Jul 1, 2016
2f3e7ea
Merge remote-tracking branch 'victoria/master' into release/v.3.0.2
Jul 4, 2016
5348890
patient_management changes
Jul 5, 2016
f04bf31
order modules updates
Jul 8, 2016
77ca3cf
Updated API documents
Jul 11, 2016
5a80588
Updates From kevin
Jul 11, 2016
a32cbcc
API DB added to settings_management
Jul 11, 2016
6aff61f
Added column(missed pills, pill count, Appointment ) on Patient Patie…
Jul 14, 2016
bd6d92a
changes on CDRR
Jul 14, 2016
9c9fccd
Merge remote-tracking branch 'victoria/master' into release/v.3.0.2
Jul 21, 2016
0326103
Clean code. Update on TB days
Jul 22, 2016
f339fc6
new changes from marete and vicky
Aug 11, 2016
0ca8a03
Dispense to patients links, solved
Aug 15, 2016
073e0c4
changes, bug fixes.
Aug 15, 2016
ca95b77
update on the Guidlines
Aug 17, 2016
5f6f722
updated auto_management
Aug 17, 2016
809c802
dowload templates moved
Aug 22, 2016
da21a41
modification to the order module
Aug 22, 2016
8bc44fa
create view and orders modified.
Aug 23, 2016
69c2dd1
updated on the order
Aug 23, 2016
03e795e
right use of code
Aug 24, 2016
897da2c
changes by marete
Aug 26, 2016
b6ccc71
final changes from marete
Aug 26, 2016
98a5c6f
changes - RAW
Aug 26, 2016
47880de
updates from marete
Aug 29, 2016
edcb293
Offline Order Module
Sep 2, 2016
22c0d0a
Offline Order Module (#2)
Sep 2, 2016
5d145af
Offline Order Module - Mysql 5.5 Fix
Sep 5, 2016
53ad274
FMAPs Download Bug Fix
Sep 7, 2016
0bd1567
MAPS OI Download Fix
Sep 7, 2016
d1b7fc9
Working Offline Order Module (#4)
Sep 7, 2016
6b4cff2
Merge branch 'master' of https://github.com/OmondiKevin/ADT into rele…
Sep 8, 2016
c163ec3
#CDRR Fix - Missing adjustments_neg column
Sep 8, 2016
1720f6a
New Repository
victoriawasonga Sep 8, 2016
cd58e3d
/***********Viral Load ************/
victoriawasonga Sep 9, 2016
3f10585
Removed ttfonts
Sep 15, 2016
c428a1d
added necessary fonts
Sep 15, 2016
f171349
viral load improvement 2
victoriawasonga Sep 15, 2016
9b45453
viral load changes
Sep 21, 2016
73e9715
Merge branch 'master' of https://github.com/victoriawasonga/ADT
Sep 21, 2016
59df2c0
Viral Load Fix
Sep 21, 2016
dde021b
#CDRR Refix - Missing adjustments_neg column
Sep 21, 2016
8e3a505
Offline Order Module -MySQL 5.5 Fix (#3)
Sep 21, 2016
9c74257
#CDRR FIX - Missing adjustments_neg column (#5)
Sep 21, 2016
dcbd83a
Merge branch 'master' of https://github.com/OmondiKevin/ADT into rele…
Sep 21, 2016
662e795
Merge remote-tracking branch 'origin/release/v.3.0.2' into release/v.…
Sep 21, 2016
538e857
viral Load improvements
victoriawasonga Sep 21, 2016
20a6c77
no message
victoriawasonga Sep 21, 2016
0616a6e
viral load
victoriawasonga Sep 21, 2016
7b1ef17
Merge branch 'release/v.3.0.2' of https://github.com/OmondiKevin/ADT
victoriawasonga Sep 21, 2016
256f8f6
#Fix Viral Load API
Sep 21, 2016
ccabdc9
viral Load
victoriawasonga Sep 21, 2016
0a53c03
Merge branch 'master' of https://github.com/victoriawasonga/ADT
victoriawasonga Sep 21, 2016
801beda
Merge pull request #1 from KevinMarete/master
victoriawasonga Sep 22, 2016
0f450dc
Merge remote-tracking branch 'marete/master' into release/v.3.0.2
Sep 23, 2016
54537ea
ADT_IQCARE
victoriawasonga Oct 10, 2016
604f22a
#Pending order fix
Oct 12, 2016
546bfc7
Merge remote-tracking branch 'victoria/master'
Oct 12, 2016
e72b080
#Fix mirth database in main database
Oct 12, 2016
0d8704d
#Fix Order Module facility type bug
Oct 12, 2016
a4bb322
#Latest order module (#8)
Oct 17, 2016
b4e7bc2
#Fixes Dispensing Procedure,viral load listing,patient iq_care notifi…
Oct 19, 2016
b88f12f
new changes
Oct 21, 2016
1903769
changes
Oct 21, 2016
6e1822a
#Fixed Dispensing Label Printing
Oct 21, 2016
b5eec5c
.gitignore
victoriawasonga Oct 21, 2016
29f34b0
Merge remote-tracking branch 'Marete_/master'
victoriawasonga Oct 21, 2016
cac3ea4
#Fixed SQL Statement not running in mySQL 5.6
Oct 25, 2016
1df6dd5
#Fix Patient List not showing active/inactive
Nov 7, 2016
9edc65a
Merge remote-tracking branch 'marete/master'
Nov 8, 2016
f6f02e1
Merge branch 'master' into release/v.3.0.2
Nov 8, 2016
f5ce403
compeleted on labels with better view
Nov 8, 2016
9dc6905
Merge pull request #3 from OmondiKevin/master
Nov 8, 2016
6e75653
#Added Missing Export Folder
Nov 8, 2016
fa5b9f5
#Added Missing Export Folder
Nov 8, 2016
4b19b0d
#Added Ignore Export folder
Nov 8, 2016
5221724
adherence %ge. Fixed
Nov 9, 2016
e3e61bf
rough testing
victoriawasonga Nov 15, 2016
cb2ba7d
git ignore
Nov 15, 2016
1bff5c5
Merge branch 'master' of https://github.com/OmondiKevin/ADT
victoriawasonga Nov 15, 2016
612fff1
Merge remote-tracking branch 'V_Wasonga/master'
Nov 15, 2016
444a437
appointments % cleaning from the DB
Nov 16, 2016
2bc9b6f
#Added Ignore download directory
Nov 19, 2016
e989c3f
#Added Missing Export and Download folder
Nov 19, 2016
8988048
Integration of Pediatric dosing chart during dispensing
victoriawasonga Nov 22, 2016
40fcb9e
fixed the JavaScript error
Nov 22, 2016
e0249d4
Merge branch 'master' of https://github.com/victoriawasonga/ADT into …
Nov 22, 2016
7ac2913
Merge remote-tracking branch 'Marete_/master'
victoriawasonga Nov 22, 2016
7df29b4
new SQL to make the blank adherence 0
Nov 22, 2016
bd5a134
deleted older junk
Nov 22, 2016
7286030
#Merge remote-tracking branch 'omondi/release/v.3.0.2'
victoriawasonga Nov 23, 2016
ed44338
Merge pull request #4 from victoriawasonga/master
Nov 23, 2016
a384d9a
#Fix: Submit Button Submit twice solved
Nov 23, 2016
5a794f6
Merge branch 'release/v.3.0.2'
Nov 23, 2016
c7c3394
# Fix Dosing Chart Showing Disabled Configuration
Nov 23, 2016
95b09cc
Merge pull request #5 from OmondiKevin/master
Nov 23, 2016
a2dcd00
#Fix: Duplicate Saving on DoubleClick Submit (Partially done)
Nov 23, 2016
45fa8ae
merged
victoriawasonga Nov 24, 2016
2f350d5
Update Tab and funtions removed
Nov 24, 2016
60b1907
Merge pull request #6 from OmondiKevin/master
Nov 25, 2016
744800b
#Fix: Remove Update Tables button from Regimen Settings and Added Dos…
Nov 25, 2016
eb7aefa
lost to follow up 180 Days
Nov 29, 2016
61da704
lost to follow up 180 Days
Nov 29, 2016
9e06c0c
Ref. / Order number changed to Required - - NOT COMPLETE
Nov 29, 2016
be5bb27
#Fix: Ref. Order no Required!
Nov 30, 2016
88ae66b
Merge branch 'master' into release/v.3.0.2
Nov 30, 2016
91dab2e
#Fix: Status Change Date not updated when patient status is changed f…
Nov 30, 2016
c34d388
#Feature: Integration of Pediatric dosing chart during dispensing(dyn…
victoriawasonga Nov 30, 2016
95a69f4
#Feature: Viral Load Notifications during Dispensing( V1)
victoriawasonga Dec 1, 2016
22324c2
Merge pull request #8 from OmondiKevin/master
Dec 1, 2016
0966a28
#Fix: Status Change Date not updated when patient status is changed f…
Dec 1, 2016
f083a33
#Fix: Missing Cache folder and redundant auto_management_fix controller
Dec 1, 2016
8ffe32c
#Fix: Missing cache folder
Dec 1, 2016
012da36
#Fix: Dosing Chart not picking paediatric drugs
Dec 14, 2016
ec0a80e
#Fix: Negative adjustment (-) error causes the submit to be disabled
Dec 15, 2016
acdf1c4
Merged from marete repo
victoriawasonga Jan 9, 2017
f6be7bd
#Fix: Negative quantity popup during dispensing because default quant…
victoriawasonga Jan 9, 2017
54b5254
dont merge
victoriawasonga Jan 9, 2017
7cd7192
Merge remote-tracking branch 'origin/master'
victoriawasonga Jan 9, 2017
bc006bc
#Fix: Changing transaction type does not reset the inventory/stock page
Jan 9, 2017
73fc248
#Fix: Changing transaction type does not reset the inventory/stock pa…
Jan 9, 2017
8194205
#Fix: Negative quantity popup during dispensing because default quant…
victoriawasonga Jan 9, 2017
8e780e0
#Fix: Report for Drugs Issued at not showing all satellites and drug …
Jan 12, 2017
1faefee
#Feature: Update latest guidelines (actually was a fix)
Jan 12, 2017
3981833
Merge remote-tracking branch 'V_Wasonga/master' into release/v.3.0.2
Jan 12, 2017
1492ebb
merged changes from victoria
Jan 12, 2017
a639b44
new changes
victoriawasonga Jan 12, 2017
4c9cb53
New Changes made
victoriawasonga Jan 12, 2017
438e1cd
Changes made by Victoria
Jan 12, 2017
aff3baa
Merge remote-tracking branch 'omondi/release/v.3.0.2'
victoriawasonga Jan 12, 2017
fdaa8fe
#Fix: Negative quantity popup during dispensing because default quant…
victoriawasonga Jan 12, 2017
7a487d4
#Fix: Link to parent/guardian is showing for adults in Patient Details
victoriawasonga Jan 13, 2017
2614b2b
#Fix: Dosing Value replaced by id in dispensing history list (Patient…
victoriawasonga Jan 13, 2017
300cd74
#Feature: Allow pharmacist to adjust lost to follow-up days like the …
victoriawasonga Jan 13, 2017
06e8fed
#Fix: Changing transaction type does not reset the inventory/stock page
Jan 13, 2017
a2719bb
#Fix: Ensure icons are visible when port is changed from 80
Jan 13, 2017
de509b1
fix
Jan 13, 2017
0cc4f86
Merge branch 'master' of https://github.com/OmondiKevin/ADT into rele…
Jan 13, 2017
9cf518b
#Fix: Ensure icons are visible when port is changed from 80
Jan 13, 2017
ea1c7bd
changes on port 80
Jan 13, 2017
25c540c
Fix
Jan 13, 2017
56f6e87
Merge branch 'master' into release/v.3.0.2
Jan 13, 2017
537cd6d
database.php
Jan 13, 2017
6e2f930
All Changes Done
Jan 13, 2017
afc4f6f
#Fix: Lost to follow up update
Jan 13, 2017
ec48376
Merge pull request #11 from OmondiKevin/master
Jan 16, 2017
5a4d911
# ADT Version 3.1 - Pre Release Update 1.0
Jan 16, 2017
b10b1fa
#Fix: Update MOH 731 Template and MOH 731 not picking enrolled in care
Jan 18, 2017
3e96b24
#Fix: Stock consumption report(JSON Error) (LVCT Specific)
victoriawasonga Jan 18, 2017
3b6ea3b
#Fix: Patient visited for refill (Adherence Error) - LVCT & Others
Jan 18, 2017
fc9ef36
#Fix: Bin card JSON error (LVCT specific)
victoriawasonga Jan 18, 2017
7c44b93
#Fix: Bin card JSON error (LVCT specific)
victoriawasonga Jan 18, 2017
3a2b379
#Fix: Ensure correct calculation of expected pill count
victoriawasonga Jan 18, 2017
30e250f
Merge remote-tracking branch 'V_Wasonga/master' into release/v.3.0.2
Jan 19, 2017
4b14284
#Fix: Update MOH 731 Template and MOH 731 not picking enrolled in car…
Jan 19, 2017
59b7db9
#Fix: Test and ensure bulk mapping is working and also ensure that it…
Jan 20, 2017
13ab7da
# fix remove link between days to appointment duration.
victoriawasonga Jan 20, 2017
1031799
#Fix: Duplicate Saving on DoubleClick Submit
victoriawasonga Jan 20, 2017
1edb136
Updated version
Jan 20, 2017
efe97bb
Merge remote-tracking branch 'V_Wasonga/master' into release/v.3.0.2
Jan 20, 2017
7d640dd
#Fix: Ignore Export and Cache folder contents
Jan 20, 2017
81ee1a4
# fix removed the link between the days to next appointment and duration
victoriawasonga Jan 20, 2017
390489f
viral load, still dirty...
Jan 26, 2017
ccf30c1
Differenciated Care fn()----------- still RAW
Jan 27, 2017
6cc3443
#Fix: Missing Export Folder
Jan 27, 2017
67d16e3
#Feature: Differentiated Care Report -- CHART
Jan 27, 2017
d28d1a4
Merge remote-tracking branch 'V_Wasonga/master' into develop
Jan 27, 2017
5a074a3
Merge remote-tracking branch 'marete/master' into develop
Jan 27, 2017
48e0851
merged
victoriawasonga Jan 28, 2017
a0032d3
#Feature: Viral Load Notifications during Dispensing
victoriawasonga Jan 28, 2017
d32278f
viral manual add
victoriawasonga Jan 28, 2017
4ee6718
New Changes
Jan 30, 2017
6543b74
#Feature: Differentiated Care Report ---- Updated. Errors Fixed
Jan 30, 2017
8322e64
Merge branch 'master' into develop
Jan 30, 2017
516eac0
#Feature: Add Viral Load data manually, maybe through settings
victoriawasonga Jan 30, 2017
5072614
Merge remote-tracking branch 'V_Wasonga/master' into release/v.3.0.2
Jan 30, 2017
a67f7f6
#Feature: Viral Load Notifications during Dispensing -- NO ERRORS
Jan 30, 2017
aabb55b
Updates to Fix the Errors.
Jan 31, 2017
b0e509d
#Fix: Test and ensure bulk mapping is working and also ensure that it…
Jan 31, 2017
befc6a6
changes from release
Jan 31, 2017
6d06837
Merge branch 'release/v.3.0.2'
Jan 31, 2017
6c31076
Final Copy. ADT Version 3.1v
Jan 31, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 11 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,14 @@ RCS
RCSLOG
SCCS
_$*
/nbproject/private/
/nbproject/private/
application/views/sections/link.php
application/config/database.php

# exclude everything
assets/cache/*
Export/*

# exception to the rule
!assets/cache/.gitkeep
!Export/.gitkeep
1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/ADT.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

206 changes: 206 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
Loading