Skip to content

My Changes uploaded. #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stevkky wants to merge 2 commits into
base: master
Choose a base branch
from
Open

My Changes uploaded. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58c810c
v2.9.1 changes - DHIS and equipment interface
stevkky Apr 7, 2015
1eb1328
DB data changes
stevkky Apr 8, 2015
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
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# Logs and databases #
######################
*.log
*.sql
# *.sql New version changes in db has to be uploaded
*.sqlite

# OS generated files #
Expand All @@ -41,6 +41,7 @@ Thumbs.db
################
.buildpath
.project
.settings/
BLIS.exe.manifest
BlisSetup.html
FirefoxPortable/
Expand Down
4 changes: 4 additions & 0 deletions htdocs/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ RewriteRule ^worksheet_custom_updated\.php$ config/worksheet_custom_updated.php


## /reports folder

ReWriteRule ^report_pdf\.php$ reports/report_pdf.php
ReWriteRule ^reports_auxid\.php$ reports/reports_auxid.php
ReWriteRule ^reports_testhistory_new\.php$ reports/reports_testhistory_new.php
RewriteRule ^reports\.php$ reports/reports.php
RewriteRule ^report_onetesthistory\.php$ reports/report_onetesthistory.php
RewriteRule ^report_selected_tests\.php$ reports/report_selected_tests.php
Expand Down
14 changes: 11 additions & 3 deletions htdocs/.htaccess.bak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ php_value upload_max_filesize 100M
#


RewriteRule ^lang_update\.php$ Language/lang_update.php

## /config folder
RewriteRule ^lab_configs\.php$ config/lab_configs.php
RewriteRule ^lab_config_home\.php$ config/lab_config_home.php
Expand All @@ -42,6 +44,10 @@ RewriteRule ^worksheet_custom_updated\.php$ config/worksheet_custom_updated.php


## /reports folder

ReWriteRule ^report_pdf\.php$ reports/report_pdf.php
ReWriteRule ^reports_auxid\.php$ reports/reports_auxid.php
ReWriteRule ^reports_testhistory_new\.php$ reports/reports_testhistory_new.php
RewriteRule ^reports\.php$ reports/reports.php
RewriteRule ^report_onetesthistory\.php$ reports/report_onetesthistory.php
RewriteRule ^report_selected_tests\.php$ reports/report_selected_tests.php
Expand All @@ -56,6 +62,7 @@ RewriteRule ^reports_specimenlog\.php$ reports/reports_specimenlog.php
RewriteRule ^reports_print\.php$ reports/reports_print.php
RewriteRule ^reports_dailyspecimens\.php$ reports/reports_dailyspecimens.php
RewriteRule ^reports_dailypatients\.php$ reports/reports_dailypatients.php
RewriteRule ^reports_dailypatientBarcodes\.php$ reports/reports_dailypatientBarcodes.php
RewriteRule ^reports_infection\.php$ reports/reports_infection.php
RewriteRule ^doctor_stats\.php$ reports/doctor_stats.php
RewriteRule ^reports_specimencount\.php$ reports/reports_specimencount.php
Expand Down Expand Up @@ -121,6 +128,7 @@ RewriteRule ^session_print\.php$ regn/session_print.php

## /results folder
RewriteRule ^results_entry\.php$ results/results_entry.php
RewriteRule ^related_tests_results_entry\.php$ results/related_tests_results_entry.php
RewriteRule ^results_batch_add\.php$ results/results_batch_add.php
RewriteRule ^results_verify\.php$ results/results_verify.php
RewriteRule ^worksheet\.php$ results/worksheet.php
Expand Down Expand Up @@ -162,6 +170,7 @@ RewriteRule ^edit_profile\.php$ users/edit_profile.php
RewriteRule ^change_profile\.php$ users/change_profile.php
RewriteRule ^change_pwd\.php$ users/change_pwd.php
RewriteRule ^password_reset\.php$ users/password_reset.php
RewriteRule ^oneTime_password_reset\.php$ users/oneTime_password_reset.php
RewriteRule ^lab_admins\.php$ users/lab_admins.php
RewriteRule ^lab_admin_new\.php$ users/lab_admin_new.php
RewriteRule ^lab_admin_edit\.php$ users/lab_admin_edit.php
Expand All @@ -175,6 +184,8 @@ RewriteRule ^logout\.php$ users/logout.php
RewriteRule ^home\.php$ users/home.php
RewriteRule ^accesslist\.php$ users/accesslist.php

RewriteRule ^passwordReset\.php$ users/passwordReset.php


## /feedback folder
RewriteRule ^comments\.php$ feedback/comments.php
Expand Down Expand Up @@ -244,8 +255,5 @@ RewriteRule ^update_discount_for_association\.php$ billing/update_discount_for_a

## /director folder
RewriteRule ^lab_pin\.php$ director/lab_pin.php
<<<<<<< HEAD
RewriteRule ^geo_report_dir\.php$ director/geo_report_dir.php
=======
>>>>>>> 2ee06ac892448ea77142d374b962d6f3a0656da2
RewriteRule ^update_lab_coords\.php$ director/update_lab_coords.php
295 changes: 160 additions & 135 deletions htdocs/Language/default.php.bak
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 0 additions & 40 deletions htdocs/Language/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,46 +13,6 @@
<key>PWD</key>
<value>Password</value>
</term>
<term>
<key>DEFAULT_CURRENCY</key>
<value>Default Currency Name:</value>
</term>
<term>
<key>CURRENCY_DELIMITER</key>
<value>Currency Delimiter:</value>
</term>
<term>
<key>CURRENCY</key>
<value>Currency</value>
</term>
<term>
<key>EXCHANGE_RATE</key>
<value>Exchange Rate</value>
</term>
<term>
<key>UPDATED_DATE</key>
<value>Updated Date</value>
</term>
<term>
<key>RELATED_TESTS_NOTFOUND</key>
<value>Related Tests Not Found</value>
</term>
<term>
<key>ACTIONS</key>
<value>Actions</value>
</term>
<term>
<key>ADD_CURRENCY_RATEY</key>
<value>Add new currency rate</value>
</term>
<term>
<key>ADD_CURRENCY</key>
<value>Add a new currency >></value>
</term>
<term>
<key>NEW_CURRENCY</key>
<value>New Currency</value>
</term>
<term>
<key>PWD_TEMP</key>
<value>Temp Password</value>
Expand Down
Loading