New dictation modernazation #818
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,50 @@ | ||
| <?php | ||
| /** | ||
| * Dictation Form | ||
| * | ||
| * @package OpenEMR | ||
| * @link http://www.open-emr.org | ||
| * @author Sherwin Gaddis <sherwingaddis@gmail.com> | ||
| * @license https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3 | ||
| * @copyright Copyright (c) 2017 Sherwin Gaddis <sherwingaddis@gmail.com> | ||
| * | ||
| */ | ||
|
|
||
| use OpenEMR\Core\Header; | ||
|
|
||
| include_once("../../globals.php"); | ||
| include_once("$srcdir/api.inc"); | ||
| formHeader("Form: dictation"); | ||
| $returnurl = 'encounter_top.php'; | ||
| ?> | ||
| <html> | ||
| <head> | ||
| <title><?php echo xlt('Dictation'); ?></title> | ||
| <?php Header::setupHeader(); ?> | ||
| <script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/ckeditor-4-7-0/ckeditor.js"</script> | ||
| <script src="<?php echo $GLOBALS['assets_static_relative']; ?>/ckeditor-4-7-0/js/samples/sample.js" type="text/javascript"></script> | ||
| <link href="<?php echo $GLOBALS['assets_static_relative']; ?>/ckeditor-4-7-0/css/samples/samples.css" rel="stylesheet" type="text/css" /> | ||
| </head> | ||
| <body class="body_top"> | ||
| <div class="container"> | ||
| <div class="page-header"> | ||
| <h1><?php echo xlt('Speech Dictation'); ?></h1><br><br> | ||
| </div> | ||
| <form method=post action="<?php echo $rootdir;?>/forms/dictation/save.php?mode=new" name="my_form" onclick="top.restoreSession()"> | ||
|
|
||
| <div class="form-group"> | ||
| <label for="dictation"><?php echo xlt('Dictation: '); ?></label><br><textarea class="form-control ckeditor" name="dictation" ></textarea> | ||
|
There was a problem hiding this comment. @bradymiller, correct me if I'm wrong, but shouldn't end-of-line spaces and punctuation like this be avoided? Also, I'm in favor of yanking colons from labels all together There was a problem hiding this comment. @robertdown A good general strategy: |
||
| </div> | ||
| <div class="form-group"> | ||
| <label for="additional_notes"><?php echo xlt('Additional Notes:'); ?> </label><br><textarea class="form-control ckeditor" name="additional_notes" ></textarea> | ||
| </div> | ||
|
|
||
| <button type="submit" class="btn btn-default btn-save"><?php echo xlt('Save'); ?></button> | ||
|
|
||
| <a href="<?php echo "$rootdir/patient_file/encounter/$returnurl";?>" class="btn btn-cancel btn-link" onclick="top.restoreSession()"><?php echo xlt('Cancel'); ?></a> | ||
| </form> | ||
| </div> | ||
|
|
||
| <?php | ||
| formFooter(); | ||
| ?> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,60 @@ | ||
| <?php | ||
| /** | ||
| * Dictation Form Edit Saved Data | ||
| * | ||
| * @package OpenEMR | ||
| * @link http://www.open-emr.org | ||
| * @author Sherwin Gaddis <sherwingaddis@gmail.com> | ||
| * @license https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3 | ||
| * @copyright Copyright (c) 2017 Sherwin Gaddis <sherwingaddis@gmail.com> | ||
| * | ||
| */ | ||
|
|
||
| use OpenEMR\Core\Header; | ||
| include_once("../../globals.php"); | ||
|
|
||
| $returnurl = 'encounter_top.php'; | ||
| ?> | ||
| <html> | ||
| <head> | ||
| <title><?php echo xlt('Dictation'); ?></title> | ||
| <?php Header::setupHeader(); ?> | ||
| <script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/ckeditor-4-7-0/ckeditor.js"</script> | ||
| <script src="<?php echo $GLOBALS['assets_static_relative']; ?>/ckeditor-4-7-0/js/samples/sample.js" type="text/javascript"></script> | ||
| <link href="<?php echo $GLOBALS['assets_static_relative']; ?>/ckeditor-4-7-0/css/samples/samples.css" rel="stylesheet" type="text/css" /> | ||
| </head> | ||
| <body class="body_top"> | ||
| <div class="container"> | ||
| <?php | ||
| include_once("$srcdir/api.inc"); | ||
| $id = filter_input(INPUT_GET, "id", FILTER_VALIDATE_INT); | ||
| $obj = formFetch("form_dictation", $id); | ||
| ?> | ||
| <form method=post action="<?php echo $rootdir?>/forms/dictation/save.php?mode=update&id=<?php echo attr($id);?>" name="my_form" onclick="top.restoreSession()"> | ||
| <div class="page-header"> | ||
| <h1><?php echo xlt('Speech Dictation'); ?></h1> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label for="dictation"><?php echo xlt('Dictation: '); ?></label><br><textarea class="form-control ckeditor" name="dictation" ><?php | ||
| $config = HTMLPurifier_Config::createDefault(); | ||
| $purifier = new HTMLPurifier($config); | ||
| $clean_html = $purifier->purify($obj{"dictation"}); | ||
| echo trim($clean_html); ?></textarea> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label for="additional_notes"><?php echo xlt('Additional Notes: '); ?></label><br><textarea class="form-control ckeditor" name="additional_notes" ><?php | ||
| $config = HTMLPurifier_Config::createDefault(); | ||
| $purifier = new HTMLPurifier($config); | ||
| $clean_html = $purifier->purify($obj{"additional_notes"}); | ||
| echo trim($clean_html); ?></textarea> | ||
| </div> | ||
|
|
||
| <button type="submit" class="btn btn-default btn-save"><?php echo xlt('Update'); ?></button> | ||
|
|
||
| <a href="<?php echo "$rootdir/patient_file/encounter/$returnurl";?>" class="btn btn-cancel btn-link" onclick="top.restoreSession()"><?php echo xlt('Cancel'); ?></a> | ||
| </form> | ||
| </div> | ||
|
|
||
| <?php | ||
| formFooter(); | ||
| ?> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| /.gitattributes export-ignore | ||
| /.gitignore export-ignore | ||
| /.travis.yml export-ignore | ||
| /Doxyfile export-ignore | ||
| /art/ export-ignore | ||
| /benchmarks/ export-ignore | ||
| /configdoc/ export-ignore | ||
| /configdoc/usage.xml -crlf | ||
| /docs/ export-ignore | ||
| /phpdoc.ini | ||
| /smoketests/ export-ignore | ||
| /tests/* export-ignore | ||
| /tests/path2class.func.php -export-ignore |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| tags | ||
| conf/ | ||
| test-settings.php | ||
| config-schema.php | ||
| library/HTMLPurifier/DefinitionCache/Serializer/*/ | ||
| library/standalone/ | ||
| library/HTMLPurifier.standalone.php | ||
| library/HTMLPurifier*.tgz | ||
| library/package*.xml | ||
| smoketests/test-schema.html | ||
| configdoc/*.html | ||
| configdoc/configdoc.xml | ||
| docs/doxygen* | ||
| *.phpt.diff | ||
| *.phpt.exp | ||
| *.phpt.log | ||
| *.phpt.out | ||
| *.phpt.php | ||
| *.phpt.skip.php | ||
| *.htmlt.ini | ||
| *.patch | ||
| /*.php | ||
| vendor | ||
| composer.lock | ||
| *.rej | ||
| *.orig | ||
| *.bak | ||
| core |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| language: php | ||
| php: | ||
| - '5.3' | ||
| - '5.4' | ||
| - '5.5' | ||
| - '5.6' | ||
| - '7.0' | ||
| - '7.1' | ||
| before_script: | ||
| - git clone --depth=50 https://github.com/ezyang/simpletest.git | ||
| - cp test-settings.travis.php test-settings.php | ||
| script: | ||
| - php tests/index.php |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
|
|
||
| CREDITS | ||
|
|
||
| Almost everything written by Edward Z. Yang (Ambush Commander). Lots of thanks | ||
| to the DevNetwork Community for their help (see docs/ref-devnetwork.html for | ||
| more details), Feyd especially (namely IPv6 and optimization). Thanks to RSnake | ||
| for letting me package his fantastic XSS cheatsheet for a smoketest. | ||
|
|
||
| vim: et sw=4 sts=4 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Container should be up by the body, we want most everything contained