oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/demographic demographiceditdemographic.jsp, 1.156, 1.157

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5483

Modified Files:
	demographiceditdemographic.jsp 
Log Message:
- ID: 3103761 Added function keyword to removeAccents in javascript

Index: demographiceditdemographic.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographiceditdemographic.jsp,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -d -r1.156 -r1.157
*** demographiceditdemographic.jsp	21 Oct 2010 00:39:33 -0000	1.156
--- demographiceditdemographic.jsp	5 Nov 2010 18:15:37 -0000	1.157
***************
*** 379,383 ****
  }
  
! removeAccents(s){
          var r=s.toLowerCase();
          r = r.replace(new RegExp("\\s", 'g'),"");
--- 379,383 ----
  }
  
! function removeAccents(s){
          var r=s.toLowerCase();
          r = r.replace(new RegExp("\\s", 'g'),"");

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql/caisi initcaisidata.sql, 1.81, 1.82

[annie <ann...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22065/database/mysql/caisi

Modified Files:
	initcaisidata.sql 
Log Message:
added PSYCHIATRIST billing form.

Index: initcaisidata.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi/initcaisidata.sql,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** initcaisidata.sql	4 Oct 2010 20:30:25 -0000	1.81
--- initcaisidata.sql	5 Nov 2010 17:46:40 -0000	1.82
***************
*** 1970,1973 ****
--- 1970,2002 ----
  insert into encounterForm values("Mental Health Form42","../form/formMentalHealthForm42.jsp?demographic_no=","formMentalHealthForm42",0);
  
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K203A','Group3','Group3','A',1);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K204A','Group3','Group3','A',2);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K205A','Group3','Group3','A',3);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K620A','Group3','Group3','A',4);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K623A','Group3','Group3','A',5);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K624A','Group3','Group3','A',6);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K992A','Group3','Group3','A',7);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K994A','Group3','Group3','A',8);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K002A','Group2','Group2','A',1);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K003A','Group2','Group2','A',2);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K005A','Group2','Group2','A',3);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K050A','Group2','Group2','A',4);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K051A','Group2','Group2','A',5);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K052A','Group2','Group2','A',6);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K053A','Group2','Group2','A',7);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K054A','Group2','Group2','A',8);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K055A','Group2','Group2','A',9);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K193A','Group2','Group2','A',10);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K195A','Group2','Group2','A',11);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K197A','Group2','Group2','A',12);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K198A','Group2','Group2','A',13);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A194A','Group1','Group1','A',2);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A193A','Group1','Group1','A',1);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A195A','Group1','Group1','A',3);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A395A','Group1','Group1','A',4);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','G497A','Group1','Group1','A',6);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A795A','Group1','Group1','A',5);
+ 
+ 
  source init_cds_form_4_options.sql;
  source init_functional_centres.sql;
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscardata.sql, 1.105, 1.106

[annie <ann...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21913/database/mysql

Modified Files:
	oscardata.sql 
Log Message:
Moved PSYCHIATRIST billing form to caisi init db data file.

Index: oscardata.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscardata.sql,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** oscardata.sql	5 Nov 2010 17:37:37 -0000	1.105
--- oscardata.sql	5 Nov 2010 17:46:18 -0000	1.106
***************
*** 50,80 ****
  -- Dumping data for table 'ctl_billingservice'
  --
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K203A','Group3','Group3','A',1);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K204A','Group3','Group3','A',2);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K205A','Group3','Group3','A',3);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K620A','Group3','Group3','A',4);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K623A','Group3','Group3','A',5);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K624A','Group3','Group3','A',6);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K992A','Group3','Group3','A',7);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K994A','Group3','Group3','A',8);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K002A','Group2','Group2','A',1);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K003A','Group2','Group2','A',2);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K005A','Group2','Group2','A',3);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K050A','Group2','Group2','A',4);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K051A','Group2','Group2','A',5);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K052A','Group2','Group2','A',6);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K053A','Group2','Group2','A',7);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K054A','Group2','Group2','A',8);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K055A','Group2','Group2','A',9);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K193A','Group2','Group2','A',10);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K195A','Group2','Group2','A',11);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K197A','Group2','Group2','A',12);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K198A','Group2','Group2','A',13);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A194A','Group1','Group1','A',2);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A193A','Group1','Group1','A',1);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A195A','Group1','Group1','A',3);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A395A','Group1','Group1','A',4);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','G497A','Group1','Group1','A',6);
- insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A795A','Group1','Group1','A',5);
  
  --
--- 50,53 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql/caisi initcaisidata.sql, 1.76.4.2, 1.76.4.3

[annie <ann...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv20847/database/mysql/caisi

Modified Files:
      Tag: RELEASE_10_06
	initcaisidata.sql 
Log Message:
added psychiatrist billing form.

Index: initcaisidata.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi/initcaisidata.sql,v
retrieving revision 1.76.4.2
retrieving revision 1.76.4.3
diff -C2 -d -r1.76.4.2 -r1.76.4.3
*** initcaisidata.sql	30 Sep 2010 21:05:40 -0000	1.76.4.2
--- initcaisidata.sql	5 Nov 2010 17:41:52 -0000	1.76.4.3
***************
*** 1970,1973 ****
--- 1970,2003 ----
  insert into encounterForm values("Mental Health Form42","../form/formMentalHealthForm42.jsp?demographic_no=","formMentalHealthForm42",0);
  
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K203A','Group3','Group3','A',1);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K204A','Group3','Group3','A',2);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K205A','Group3','Group3','A',3);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K620A','Group3','Group3','A',4);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K623A','Group3','Group3','A',5);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K624A','Group3','Group3','A',6);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K992A','Group3','Group3','A',7);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K994A','Group3','Group3','A',8);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K002A','Group2','Group2','A',1);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K003A','Group2','Group2','A',2);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K005A','Group2','Group2','A',3);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K050A','Group2','Group2','A',4);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K051A','Group2','Group2','A',5);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K052A','Group2','Group2','A',6);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K053A','Group2','Group2','A',7);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K054A','Group2','Group2','A',8);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K055A','Group2','Group2','A',9);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K193A','Group2','Group2','A',10);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K195A','Group2','Group2','A',11);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K197A','Group2','Group2','A',12);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K198A','Group2','Group2','A',13);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A194A','Group1','Group1','A',2);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A193A','Group1','Group1','A',1);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A195A','Group1','Group1','A',3);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A395A','Group1','Group1','A',4);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','G497A','Group1','Group1','A',6);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A795A','Group1','Group1','A',5);
+ 
+ 
+ 
  source init_cds_form_4_options.sql;
  source init_functional_centres.sql;
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscardata.sql, 1.104, 1.105

[annie <ann...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv19773/database/mysql

Modified Files:
	oscardata.sql 
Log Message:
added psychiatry billing service.

Index: oscardata.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscardata.sql,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** oscardata.sql	18 Oct 2010 14:59:22 -0000	1.104
--- oscardata.sql	5 Nov 2010 17:37:37 -0000	1.105
***************
*** 50,53 ****
--- 50,80 ----
  -- Dumping data for table 'ctl_billingservice'
  --
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K203A','Group3','Group3','A',1);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K204A','Group3','Group3','A',2);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K205A','Group3','Group3','A',3);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K620A','Group3','Group3','A',4);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K623A','Group3','Group3','A',5);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K624A','Group3','Group3','A',6);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K992A','Group3','Group3','A',7);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K994A','Group3','Group3','A',8);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K002A','Group2','Group2','A',1);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K003A','Group2','Group2','A',2);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K005A','Group2','Group2','A',3);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K050A','Group2','Group2','A',4);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K051A','Group2','Group2','A',5);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K052A','Group2','Group2','A',6);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K053A','Group2','Group2','A',7);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K054A','Group2','Group2','A',8);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K055A','Group2','Group2','A',9);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K193A','Group2','Group2','A',10);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K195A','Group2','Group2','A',11);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K197A','Group2','Group2','A',12);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','K198A','Group2','Group2','A',13);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A194A','Group1','Group1','A',2);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A193A','Group1','Group1','A',1);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A195A','Group1','Group1','A',3);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A395A','Group1','Group1','A',4);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','G497A','Group1','Group1','A',6);
+ insert into ctl_billingservice values('PSYCHIATRIST',	'P01','A795A','Group1','Group1','A',5);
  
  --

[Oscarmcmaster-cvscommit] oscar_mcmaster/docs git_eclipse_working_model.txt, 1.3, 1.4

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7952/docs

Modified Files:
	git_eclipse_working_model.txt 
Log Message:
updated documentation

Index: git_eclipse_working_model.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_eclipse_working_model.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** git_eclipse_working_model.txt	5 Nov 2010 03:39:42 -0000	1.3
--- git_eclipse_working_model.txt	5 Nov 2010 03:51:20 -0000	1.4
***************
*** 8,12 ****
  Register For Gerrit
  -------------------
! Go to the gerrit web site and register your user. The gerrit url should be provided. For this example I will use https://source.oscartools.org:8080 and r6s...@gm....
  
  On the gerrit main screen you should see a register option on the top right of the screen, you should be able to register using openId with your google email or one of the similar options.
--- 8,12 ----
  Register For Gerrit
  -------------------
! Go to the gerrit web site and register your user. The gerrit url should be provided. For this example I will use https://source.oscartools.org:8080 and my email r6s...@gm... (you'll need to use your own where ever you see my account name).
  
  On the gerrit main screen you should see a register option on the top right of the screen, you should be able to register using openId with your google email or one of the similar options.
***************
*** 62,66 ****
  If you right click on the project, go to team -> commit. You'll see the commit screen. Notice on eclipse it will list the tracked and untracked file and by default they will be "git added" and "git commited" at the same time. Now when you commit, it's commited locally. This means no one else except you has these changes still.
  
! Now to share these changes with everyone else, i.e. commited to the main repository... (You must have commited locally first, you need to understand git's local/remote/distributed repositories.) First you must have updated from the remote origin, then merged the latest code into yours. This will help ensure the changes you have will merge back into the master properly. After you've done that...
  
  Now, right click on the project, go to team -> push. 
--- 62,66 ----
  If you right click on the project, go to team -> commit. You'll see the commit screen. Notice on eclipse it will list the tracked and untracked file and by default they will be "git added" and "git commited" at the same time. Now when you commit, it's commited locally. This means no one else except you has these changes still.
  
! Now to share these changes with everyone else, i.e. commited to the main repository... (You must have commited locally first, you need to understand git's local/remote/distributed repositories.) 
  
  Now, right click on the project, go to team -> push. 

[Oscarmcmaster-cvscommit] oscar_mcmaster/docs git_eclipse_working_model.txt, 1.2, 1.3

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5320/docs

Modified Files:
	git_eclipse_working_model.txt 
Log Message:
updated with actual urls used

Index: git_eclipse_working_model.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/git_eclipse_working_model.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** git_eclipse_working_model.txt	2 Nov 2010 07:47:51 -0000	1.2
--- git_eclipse_working_model.txt	5 Nov 2010 03:39:42 -0000	1.3
***************
*** 8,12 ****
  Register For Gerrit
  -------------------
! Go to the gerrit web site and register your user. The gerrit url should be provided. For this example I wil use http://localhost:8080 and r6s...@gm....
  
  On the gerrit main screen you should see a register option on the top right of the screen, you should be able to register using openId with your google email or one of the similar options.
--- 8,12 ----
  Register For Gerrit
  -------------------
! Go to the gerrit web site and register your user. The gerrit url should be provided. For this example I will use https://source.oscartools.org:8080 and r6s...@gm....
  
  On the gerrit main screen you should see a register option on the top right of the screen, you should be able to register using openId with your google email or one of the similar options.
***************
*** 35,39 ****
  On the package explorer tab (or what ever your favourite explorer is), right click and select import -> "projects from git" -> clone.
  
! The repository details should be provided for your git/gerrit installation, for my example I will use "ssh://r6squeegee@localhost:29418/foo". Just continue with the screen flow, most options should be obvious or defaults should be fine.
  
  Now back on the import screen, select the new repository (click on it again even though it's highlighted to make the next button available). Continue with the screen flow, most of the defaults should be fine.
--- 35,39 ----
  On the package explorer tab (or what ever your favourite explorer is), right click and select import -> "projects from git" -> clone.
  
! The repository details should be provided for your git/gerrit installation, for my example I will use "ssh://r6s...@so...:29418/test". Just continue with the screen flow, most options should be obvious or defaults should be fine.
  
  Now back on the import screen, select the new repository (click on it again even though it's highlighted to make the next button available). Continue with the screen flow, most of the defaults should be fine.

[Oscarmcmaster-cvscommit] oscar_mcmaster/docs gerrit_working_model.txt, 1.5, 1.6

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32222/docs

Modified Files:
	gerrit_working_model.txt 
Log Message:
updated document to match what we actually did

Index: gerrit_working_model.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/gerrit_working_model.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gerrit_working_model.txt	2 Nov 2010 07:47:51 -0000	1.5
--- gerrit_working_model.txt	5 Nov 2010 03:11:25 -0000	1.6
***************
*** 30,38 ****
  Install Gerrit (on the server)
  - Create a mysql database called "reviewdb" and a user/password for gerrit to use.
! - we'll use the users home directory as working directory open a terminal to the users home directory
  - run "java -jar gerrit-2.1.5.war init -d review_site", from here on accept the defaults if not mentione here
  - at "Sql Database", enter "mysql" instead.
  - at "SMTP server hostname", enter either a mcmaster or google smtp server information, gmails's example maybe : smtp.gmail.com:465, ssl
! - at "Canonical Url", enter the proper hostname / url for your server
  - change your linux to start gerrit upon boot up. To start gerrit : "cd ~/review_site", "./bin/gerrit.sh start". Note the funny directory change / reference in the preceeding 2 commands, it has to be that way or gerrit doesn't figure out where it's installed. (You can configure more to make it work but the prior 2 commands is the easiest way).
  - Note that we have accepted the default ports 8080 and 29418, I see no reason to change these.
--- 30,41 ----
  Install Gerrit (on the server)
  - Create a mysql database called "reviewdb" and a user/password for gerrit to use.
! - we'll put everything into /var/gerrit/* (no real reason, just where the disk space was allocated on the server)
  - run "java -jar gerrit-2.1.5.war init -d review_site", from here on accept the defaults if not mentione here
  - at "Sql Database", enter "mysql" instead.
  - at "SMTP server hostname", enter either a mcmaster or google smtp server information, gmails's example maybe : smtp.gmail.com:465, ssl
! - use SSL for the http daemon.
! - for http daemon listen port put it back to 8080 (instead of 8443)
! - at "Canonical Url", enter the proper hostname / url for your server (https://source.oscartools.org:8080/)
! - create a self signed certificate, change the number of days to something huge like 10 years.
  - change your linux to start gerrit upon boot up. To start gerrit : "cd ~/review_site", "./bin/gerrit.sh start". Note the funny directory change / reference in the preceeding 2 commands, it has to be that way or gerrit doesn't figure out where it's installed. (You can configure more to make it work but the prior 2 commands is the easiest way).
  - Note that we have accepted the default ports 8080 and 29418, I see no reason to change these.
***************
*** 50,58 ****
  		- click add and it should list it as an added key on the screen.
  	- now on the bottom of the screen there's a link that says "continue" click that, now you should be at the your "code review dashboard" screen.
! - on the top left of the screen, click on admin -> groups. Create a new group called "code_approvers"
  - on the top left of the screen, click on admin -> projects. Then select "all projects", then select "access".
! 	- add the new permissions category="code review", group name="code_approvers", range=+2
! 	- add the new permissions category="verified", group name="code_approvers", range=+1
! 	- add the new permissions category="submit", group name="code_approvers", range=+1
  
  Add a project (from client / developer machine)
--- 53,61 ----
  		- click add and it should list it as an added key on the screen.
  	- now on the bottom of the screen there's a link that says "continue" click that, now you should be at the your "code review dashboard" screen.
! - on the top left of the screen, click on admin -> groups. Create a new group called "code approvers"
  - on the top left of the screen, click on admin -> projects. Then select "all projects", then select "access".
! 	- add the new permissions category="code review", group name="code approvers", range=+2/-2
! 	- add the new permissions category="verified", group name="code approvers", range=+1/-1
! 	- add the new permissions category="submit", group name="code approvers", range=+1
  
  Add a project (from client / developer machine)

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscarResources_en.properties, 1.350, 1.351

[Peter HC <pet...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15865

Modified Files:
	oscarResources_en.properties 
Log Message:
eFormGenerator tags

Index: oscarResources_en.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v
retrieving revision 1.350
retrieving revision 1.351
diff -C2 -d -r1.350 -r1.351
*** oscarResources_en.properties	1 Nov 2010 15:03:41 -0000	1.350
--- oscarResources_en.properties	5 Nov 2010 01:47:24 -0000	1.351
***************
*** 5573,5574 ****
--- 5573,5695 ----
  receptionist.receptionistdisplaymygroup.msgTitleeditdemographic.msgPatien=MY GROUP
  oscarEncounter.Index.btnUnlink=Remove Issue
+ 
+ eFormGenerator.title=OSCAR e-Form Generator
+ eFormGenerator.expandAll=Expand All
+ eFormGenerator.collapseAll=Collapse All
+ eFormGenerator.expand=Expand
+ eFormGenerator.collapse=Collapse
+ eFormGenerator.loadImage=Load Image
+ eFormGenerator.imageChooseSelect=choose an image
+ eFormGenerator.imageUploadPrompt=If the picture does not appear on the list
+ eFormGenerator.imageUploadLink=upload it.
+ eFormGenerator.imageOrientation=Orientation of form:
+ eFormGenerator.imagePortrait=Portrait (image width should be 1500 pixels, resized to 750 pixels on screen)
+ eFormGenerator.imageLandscape=Landscape (image width should be 2000 pixels, resized to 1000 pixels on screen)
+ eFormGenerator.imageCustom=Custom
+ eFormGenerator.imageEnterInteger=(enter an integer)
+ eFormGenerator.imageLoadButton=Load Image
+ eFormGenerator.image.RedOutlinehint=If the eform image extends past the red outline, you've cropped the image too long and it won't fit on a letter-sized printout. Try typing a number smaller than 750 in the "Custom" field.
+ eFormGenerator.eFormName=eForm Name
+ eFormGenerator.nameInstruction=Enter a name for the form here
+ eFormGenerator.gender=Special Case With Gender Checkboxes
+ eFormGenerator.genderCheckbox=Gender checkboxes used in this form? If yes, click here
+ eFormGenerator.genderMale=Male
+ eFormGenerator.genderMaleButton=Click this, then click the top left corner of the male checkbox
+ eFormGenerator.genderFemale=Female
+ eFormGenerator.genderFemaleButton=Click this, then click the top left corner of the female checkbox
+ eFormGenerator.signature=Special Case With Signatures
+ eFormGenerator.signatureCheckbox=Add Signature to this form
+ eFormGenerator.signatureLoad=Automatically load user's signature images
+ eFormGenerator.signatureFragment=User Name(i.e. oscarDB=current_user) - as a shortcut, you may enter a short segment of the name, as long as this segment is unique among all the users:
+ eFormGenerator.signatureImage=Corresponding signature image file:
+ eFormGenerator.signatureAddButton=Add to List
+ eFormGenerator.signatureEmptyButton=Empty List
+ eFormGenerator.signatureLocationButton=Click here, then drag a box around the signature area
+ eFormGenerator.signatureFreehand=Add a drawing area to "sign" a signature on the fly
+ eFormGenerator.input=Add in form input fields (one-by-one)
+ eFormGenerator.inputType=a) Select An Input Type
+ eFormGenerator.inputTypeText=Single-line text input
+ eFormGenerator.inputTypeTextArea=Multi-line text input
+ eFormGenerator.inputTypeCheckbox=Checkbox
+ eFormGenerator.inputAuto=b) Auto-populating Input Box
+ eFormGenerator.inputAutoCheck=Pre-check the checkbox
+ eFormGenerator.inputTypeCustom=Custom text
+ eFormGenerator.inputTypeData=From Oscar Database
+ eFormGenerator.inputTypeDataButton=---NONE---
+ eFormGenerator.inputTypeMeasurements=Importing from Measurements
+ eFormGenerator.inputTypeMeasurementsType=Measurement Type
+ eFormGenerator.inputTypeMeasurementsButton=---NONE---
+ eFormGenerator.inputTypeMeasurementsCustom=or custom
+ eFormGenerator.inputTypeMeasurementsField=Field
+ eFormGenerator.inputTypeMeasurementsFieldButtonValue=Value
+ eFormGenerator.inputTypeMeasurementsFieldButtonDateObserved=Date Observed
+ eFormGenerator.inputTypeMeasurementsFieldButtonComment=Comment
+ eFormGenerator.inputFormat=c) Formating The Input Box
+ eFormGenerator.inputFormatFont=Font Family
+ eFormGenerator.inputFormatSelectSans=sans-serif
+ eFormGenerator.inputFormatSelectSerif=serif
+ eFormGenerator.inputFormatSelectMono=monospace
+ eFormGenerator.inputFormatStyle=Font Style
+ eFormGenerator.inputFormatStyleNormal=normal
+ eFormGenerator.inputFormatStyleItalic=italic
+ eFormGenerator.inputFormatWeight=Font Weight
+ eFormGenerator.inputFormatSize=Font Size
+ eFormGenerator.inputFormatSizehint=(in px, usually 12-14)
+ eFormGenerator.inputFormatAlign=Horizontal Alignment
+ eFormGenerator.inputFormatAlignLeft=Left
+ eFormGenerator.inputFormatAlignCenter=Center
+ eFormGenerator.inputFormatAlignRight=Right
+ eFormGenerator.inputFormatAlignJustify=Justify
+ eFormGenerator.inputFormatBackground=Background Color
+ eFormGenerator.inputFormatBackgroundTransparent=transparent
+ eFormGenerator.inputFormatBackgroundWhite=white
+ eFormGenerator.inputFormatBackgroundhint=Useful to have a white background to cover-up lines within the input field
+ eFormGenerator.inputName=c) Naming the input field:
+ eFormGenerator.inputNameSeq=i)Automatic Sequential Naming (quicker method for most cases).
+ eFormGenerator.inputNameSeqPrefix=automatic name prefix:(One Continuous Word)
+ eFormGenerator.inputNameSeqCustom=ii)Custom UNIQUE Name:
+ eFormGenerator.inputNameSeqCustomhint1=Must be one continuous word with letters/numbers only (no spaces/symbols)
+ eFormGenerator.inputNameSeqCustomhint2=Use custom naming to easily identify the corresponding html code if you're going to be editing the code later on
+ eFormGenerator.inputNameMeasurement=iii)If you would like to export the value of this input field to Measurements, select the Measurement Type and Field here:
+ eFormGenerator.inputNameMeasurementType=Measurement Type
+ eFormGenerator.inputNameMeasurementButton=---NONE---
+ eFormGenerator.inputNameMeasurementsCustom=or custom
+ eFormGenerator.inputNameMeasurementsField=Field
+ eFormGenerator.inputDraw=d) Drawing the input fields
+ eFormGenerator.inputDrawText=For one- and multi-lined textboxes:
+ eFormGenerator.inputDrawTexthint=Drag a box from the top left corner to the bottom right corner of the box.
+ eFormGenerator.inputDrawCheckbox=For checkboxes
+ eFormGenerator.inputDrawCheckboxhint=Click on the top left corner of the checkbox
+ eFormGenerator.inputDrawUndoButton=Undo
+ eFormGenerator.inputDrawhint=Repeat step # 3 until all input boxes are done.
+ eFormGenerator.tuning=Fine-tuning The Input Fields
+ eFormGenerator.tuningShowButton=Show/Hide Input Names
+ eFormGenerator.tuningUpButton=UP
+ eFormGenerator.tuningNoneButton=Uncheck All
+ eFormGenerator.tuningAllButton=Check All
+ eFormGenerator.tuningAlignButton=Align
+ eFormGenerator.tuningShiftButton=Shift
+ eFormGenerator.tuningNudgeButton=Nudge
+ eFormGenerator.tuningDeleteButton=Delete
+ eFormGenerator.tuningLeft=LEFT
+ eFormGenerator.tuningRight=RIGHT
+ eFormGenerator.tuningWidth=WIDTH
+ eFormGenerator.tuningIncreaseButton=Increase
+ eFormGenerator.tuningDecreaseButton=Decrease
+ eFormGenerator.tuningDown=DOWN
+ eFormGenerator.tuningHeight=HEIGHT
+ eFormGenerator.misc=Miscellaneous Options
+ eFormGenerator.miscMax=Maximize window when eForm loads.
+ eFormGenerator.miscMaxhint=Useful for lower resolution monitors.
+ eFormGenerator.miscCheckmarks=Emphasize Checkmarks
+ eFormGenerator.miscCheckmarksDraw="Drawing" in checkmarks during printing. Works for Firefox older than 3.5, longer code, and may not work for IE.
+ eFormGenerator.miscCheckmarksScale=Scaling up checkbox. (Works for Firefox 3.5 or newer, Safari (or similar WebKit) 3.1 or newer, IE 5-7 or IE 8 running compatibility mode, Opera 10.5)
+ eFormGenerator.generate=Generate eFormExpand/Collapse
+ eFormGenerator.generateLoadButton=Load HTML code in new window
+ eFormGenerator.generateResetButton=Start again
+ eFormGenerator.generateSaveButton=Save
+ eFormGenerator.generateRestoreSaveButton=Restore
+ eFormGenerator.generatehint1=The html code should open up in Edit E-Form window.
+ eFormGenerator.generatehint2=Now you need to fill the fields shown (form name,Additional Information,etc):
+ eFormGenerator.generatehint3=Save the form by clicking Save button
+ eFormGenerator.generatehint4=DONE!!

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx SearchDrug3.jsp, 1.68.4.8, 1.68.4.9

[jai <yg...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10955

Modified Files:
      Tag: RELEASE_10_06
	SearchDrug3.jsp 
Log Message:
-ID: 3102960
-add function to parse instruction and update quantity.

Index: SearchDrug3.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/SearchDrug3.jsp,v
retrieving revision 1.68.4.8
retrieving revision 1.68.4.9
diff -C2 -d -r1.68.4.8 -r1.68.4.9
*** SearchDrug3.jsp	4 Oct 2010 15:30:04 -0000	1.68.4.8
--- SearchDrug3.jsp	4 Nov 2010 15:27:02 -0000	1.68.4.9
***************
*** 188,192 ****
                  var url="<c:out value="${ctx}"/>" + "/oscarRx/deleteRx.do?parameterValue=clearReRxDrugList";
                         var data = "";
!                        new Ajax.Request(url, {method: 'post',parameters:data,asynchronous:false,onSuccess:function(transport){
                          }});
              }
--- 188,192 ----
                  var url="<c:out value="${ctx}"/>" + "/oscarRx/deleteRx.do?parameterValue=clearReRxDrugList";
                         var data = "";
!                        new Ajax.Request(url, {method: 'post',parameters:data,onSuccess:function(transport){
                          }});
              }
***************
*** 1088,1092 ****
                 var url="<c:out value="${ctx}"/>" + "/oscarRx/deleteRx.do?parameterValue=clearStash";
                 var data = "";
!                new Ajax.Request(url, {method: 'post',parameters:data,asynchronous:false,onSuccess:function(transport){
                              updateCurrentInteractions();
              }});
--- 1088,1092 ----
                 var url="<c:out value="${ctx}"/>" + "/oscarRx/deleteRx.do?parameterValue=clearStash";
                 var data = "";
!                new Ajax.Request(url, {method: 'post',parameters:data,onSuccess:function(transport){
                              updateCurrentInteractions();
              }});
***************
*** 1174,1178 ****
          new Ajax.Updater('rxText',url, {method:'get',parameters:data,asynchronous:true,evalScripts:true,insertion: Insertion.Bottom});
      }
! 
     function Delete2(element){        
  
--- 1174,1182 ----
          new Ajax.Updater('rxText',url, {method:'get',parameters:data,asynchronous:true,evalScripts:true,insertion: Insertion.Bottom});
      }
!     function calculateRxData(randomId){
!         var dummie=parseIntr($('instructions_'+randomId));
!         if(dummie)
!             updateQty($('quantity_'+randomId));
!     }
     function Delete2(element){        
  
***************
*** 1445,1449 ****
                      var name=encodeURIComponent(arr.name);                   
                      var params = "demographicNo=<%=bean.getDemographicNo()%>&drugId="+arr.id+"&text="+name+"&randomId="+ran_number;  //hack to get around ie caching the page
!                     new Ajax.Updater('rxText',url, {method:'get',parameters:params,asynchronous:false,evalScripts:true,
                          insertion: Insertion.Bottom,onSuccess:function(transport){
                              updateCurrentInteractions();
--- 1449,1453 ----
                      var name=encodeURIComponent(arr.name);                   
                      var params = "demographicNo=<%=bean.getDemographicNo()%>&drugId="+arr.id+"&text="+name+"&randomId="+ran_number;  //hack to get around ie caching the page
!                    new Ajax.Updater('rxText',url, {method:'get',parameters:params,evalScripts:true,
                          insertion: Insertion.Bottom,onSuccess:function(transport){
                              updateCurrentInteractions();
***************
*** 1616,1620 ****
          if(drugId!=null && $("reRxCheckBox_"+drugId).checked==true){
              var url= "<c:out value="${ctx}"/>" + "/oscarRx/rePrescribe2.do?method=represcribeMultiple";
!             new Ajax.Updater('rxText',url, {method:'get',parameters:data,asynchronous:false,evalScripts:true,
                  insertion: Insertion.Bottom,onSuccess:function(transport){
                      updateCurrentInteractions();
--- 1620,1624 ----
          if(drugId!=null && $("reRxCheckBox_"+drugId).checked==true){
              var url= "<c:out value="${ctx}"/>" + "/oscarRx/rePrescribe2.do?method=represcribeMultiple";
!             new Ajax.Updater('rxText',url, {method:'get',parameters:data,evalScripts:true,
                  insertion: Insertion.Bottom,onSuccess:function(transport){
                      updateCurrentInteractions();

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx prescribe.jsp, 1.37.2.2, 1.37.2.3

[jai <yg...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10913

Modified Files:
      Tag: RELEASE_10_06
	prescribe.jsp 
Log Message:
-ID: 3102960
-parse instruction and update quantity when new rx box appears.

Index: prescribe.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/prescribe.jsp,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -C2 -d -r1.37.2.2 -r1.37.2.3
*** prescribe.jsp	13 Jul 2010 13:58:35 -0000	1.37.2.2
--- prescribe.jsp	4 Nov 2010 15:26:47 -0000	1.37.2.3
***************
*** 10,19 ****
  <c:set var="ctx" value="${pageContext.request.contextPath}" />
      <%
- System.out.println("***### IN prescribe.jsp");
  
  List<RxPrescriptionData.Prescription> listRxDrugs=(List)request.getAttribute("listRxDrugs");
  oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean)request.getSession().getAttribute("RxSessionBean");
  
- System.out.println("listRxDrugs="+listRxDrugs);
  if(listRxDrugs!=null){
              String specStr=RxUtil.getSpecialInstructions();
--- 10,17 ----
***************
*** 69,73 ****
               quantityText=quantity+" "+rx.getUnitName();
           }
-          //System.out.println("unitName="+unitName+";;quantityText="+quantityText);
           String duration        = rx.getDuration();
           String method          = rx.getMethod();
--- 67,70 ----
***************
*** 185,189 ****
          <script type="text/javascript">
              $('drugName_'+'<%=rand%>').value=decodeURIComponent(encodeURIComponent('<%=drugName%>'));
! 
              handleEnter=function handleEnter(inField, ev){
                  var charCode;
--- 182,186 ----
          <script type="text/javascript">
              $('drugName_'+'<%=rand%>').value=decodeURIComponent(encodeURIComponent('<%=drugName%>'));
!             calculateRxData('<%=rand%>');
              handleEnter=function handleEnter(inField, ev){
                  var charCode;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx SearchDrug3.jsp, 1.80, 1.81

[jai <yg...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7788

Modified Files:
	SearchDrug3.jsp 
Log Message:
-ID: 3102960
-add function to parse instruction and update quantity.

Index: SearchDrug3.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/SearchDrug3.jsp,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** SearchDrug3.jsp	4 Oct 2010 15:20:22 -0000	1.80
--- SearchDrug3.jsp	4 Nov 2010 15:11:36 -0000	1.81
***************
*** 1177,1181 ****
          new Ajax.Updater('rxText',url, {method:'get',parameters:data,asynchronous:true,evalScripts:true,insertion: Insertion.Bottom});
      }
! 
     function Delete2(element){
  
--- 1177,1185 ----
          new Ajax.Updater('rxText',url, {method:'get',parameters:data,asynchronous:true,evalScripts:true,insertion: Insertion.Bottom});
      }
!     function calculateRxData(randomId){
!         var dummie=parseIntr($('instructions_'+randomId));
!         if(dummie)
!             updateQty($('quantity_'+randomId));
!     }
     function Delete2(element){
  
***************
*** 1760,1764 ****
      function updateSaveAllDrugsPrint(){
          var data=Form.serialize($('drugForm'));
-         oscarLog("data="+data);
          var url= "<c:out value="${ctx}"/>" + "/oscarRx/WriteScript.do?parameterValue=updateSaveAllDrugs";
          new Ajax.Request(url,
--- 1764,1767 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx prescribe.jsp, 1.40, 1.41

[jai <yg...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7709

Modified Files:
	prescribe.jsp 
Log Message:
-ID: 3102960
-parse instruction and update quantity when new rx box appears.

Index: prescribe.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/prescribe.jsp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** prescribe.jsp	12 Jul 2010 19:03:07 -0000	1.40
--- prescribe.jsp	4 Nov 2010 15:11:03 -0000	1.41
***************
*** 182,186 ****
          <script type="text/javascript">
              $('drugName_'+'<%=rand%>').value=decodeURIComponent(encodeURIComponent('<%=drugName%>'));
! 
              handleEnter=function handleEnter(inField, ev){
                  var charCode;
--- 182,186 ----
          <script type="text/javascript">
              $('drugName_'+'<%=rand%>').value=decodeURIComponent(encodeURIComponent('<%=drugName%>'));
!             calculateRxData('<%=rand%>');
              handleEnter=function handleEnter(inField, ev){
                  var charCode;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx SearchDrug3.jsp, 1.26.2.55, 1.26.2.56

[jai <yg...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3212

Modified Files:
      Tag: RELEASE_9_12
	SearchDrug3.jsp 
Log Message:
-ID: 3102960
-add function to parse instruction and update quantity.

Index: SearchDrug3.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/SearchDrug3.jsp,v
retrieving revision 1.26.2.55
retrieving revision 1.26.2.56
diff -C2 -d -r1.26.2.55 -r1.26.2.56
*** SearchDrug3.jsp	21 Oct 2010 15:00:33 -0000	1.26.2.55
--- SearchDrug3.jsp	4 Nov 2010 14:50:57 -0000	1.26.2.56
***************
*** 1178,1182 ****
          new Ajax.Updater('rxText',url, {method:'get',parameters:data,asynchronous:true,evalScripts:true,insertion: Insertion.Bottom});
      }
! 
     function Delete2(element){
  
--- 1178,1186 ----
          new Ajax.Updater('rxText',url, {method:'get',parameters:data,asynchronous:true,evalScripts:true,insertion: Insertion.Bottom});
      }
!     function calculateRxData(randomId){
!         var dummie=parseIntr($('instructions_'+randomId));
!         if(dummie)
!             updateQty($('quantity_'+randomId));
!     }
     function Delete2(element){
  

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx prescribe.jsp, 1.18.2.25, 1.18.2.26

[jai <yg...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3123

Modified Files:
      Tag: RELEASE_9_12
	prescribe.jsp 
Log Message:
-ID: 3102960
-parse instruction and update quantity when new rx box appears.

Index: prescribe.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/prescribe.jsp,v
retrieving revision 1.18.2.25
retrieving revision 1.18.2.26
diff -C2 -d -r1.18.2.25 -r1.18.2.26
*** prescribe.jsp	12 Jul 2010 18:45:15 -0000	1.18.2.25
--- prescribe.jsp	4 Nov 2010 14:50:36 -0000	1.18.2.26
***************
*** 184,188 ****
          <script type="text/javascript">
              $('drugName_'+'<%=rand%>').value=decodeURIComponent(encodeURIComponent('<%=drugName%>'));            
! 
              handleEnter=function handleEnter(inField, ev){
                  var charCode;
--- 184,188 ----
          <script type="text/javascript">
              $('drugName_'+'<%=rand%>').value=decodeURIComponent(encodeURIComponent('<%=drugName%>'));            
!             calculateRxData('<%=rand%>');
              handleEnter=function handleEnter(inField, ev){
                  var charCode;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model FollowUp.hbm.xml, NONE, 1.1 FollowUp.java, NONE, 1.1 OcularProc.hbm.xml, 1.1, 1.2 OcularProc.java, 1.1, 1.2 ProcedureBook.hbm.xml, 1.1, 1.2 ProcedureBook.java, 1.1, 1.2 SpecsHistory.hbm.xml, 1.1, 1.2 SpecsHistory.java, 1.1, 1.2 TestBookRecord.hbm.xml, 1.1, 1.2 TestBookRecord.java, 1.1, 1.2

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32002/web/WEB-INF/classes/src/org/oscarehr/eyeform/model

Modified Files:
	OcularProc.hbm.xml OcularProc.java ProcedureBook.hbm.xml 
	ProcedureBook.java SpecsHistory.hbm.xml SpecsHistory.java 
	TestBookRecord.hbm.xml TestBookRecord.java 
Added Files:
	FollowUp.hbm.xml FollowUp.java 
Log Message:
eyeform updates


Index: ProcedureBook.hbm.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/ProcedureBook.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ProcedureBook.hbm.xml	1 Oct 2010 14:10:51 -0000	1.1
--- ProcedureBook.hbm.xml	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 45,48 ****
--- 45,55 ----
  		/>
  		
+ 		<property
+ 			name="demographicNo"
+ 			column="demographic_no"
+ 			type="integer"
+ 			not-null="false"			
+ 		/>
+ 		
  		<many-to-one
  			name="demographic"
***************
*** 50,53 ****
--- 57,61 ----
  			class="org.oscarehr.common.model.Demographic"
  			not-null="false"
+ 			insert="false" update="false"
  		>
  		</many-to-one>

Index: ProcedureBook.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/ProcedureBook.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ProcedureBook.java	1 Oct 2010 14:10:51 -0000	1.1
--- ProcedureBook.java	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 18,23 ****
--- 18,30 ----
  	private String comment;
  	private Date date;
+ 	private int demographicNo;
  	
  	
+ 	public int getDemographicNo() {
+ 		return demographicNo;
+ 	}
+ 	public void setDemographicNo(int demographicNo) {
+ 		this.demographicNo = demographicNo;
+ 	}
  	public Integer getId() {
  		return id;

Index: SpecsHistory.hbm.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/SpecsHistory.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SpecsHistory.hbm.xml	1 Oct 2010 14:10:51 -0000	1.1
--- SpecsHistory.hbm.xml	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 24,28 ****
--- 24,38 ----
  			length="11"
  		/>
+ 	
+ 		
+ 		<property
+ 			name="appointmentNo"
+ 			column="appointment_no"
+ 			type="integer"
+ 			not-null="true"
+ 			length="11"
+ 		/>
  		<property
+ 		
  			name="provider"
  			column="provider"

Index: OcularProc.hbm.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/OcularProc.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OcularProc.hbm.xml	1 Oct 2010 14:10:51 -0000	1.1
--- OcularProc.hbm.xml	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 27,30 ****
--- 27,38 ----
  		
  		<property
+ 			name="appointmentNo"
+ 			column="appointment_no"
+ 			type="integer"
+ 			not-null="true"
+ 			length="11"
+ 		/>
+ 		
+ 		<property
  			name="provider"
  			column="provider"

Index: SpecsHistory.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/SpecsHistory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SpecsHistory.java	1 Oct 2010 14:10:51 -0000	1.1
--- SpecsHistory.java	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 26,31 ****
--- 26,39 ----
  	private Date updateTime;
  	private String dateStr;
+ 	private int appointmentNo;
+ 	
  	
  	
+ 	public int getAppointmentNo() {
+ 		return appointmentNo;
+ 	}
+ 	public void setAppointmentNo(int appointmentNo) {
+ 		this.appointmentNo = appointmentNo;
+ 	}
  	public String getOsSph() {
  		return osSph;

Index: TestBookRecord.hbm.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/TestBookRecord.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestBookRecord.hbm.xml	1 Oct 2010 14:10:51 -0000	1.1
--- TestBookRecord.hbm.xml	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 45,48 ****
--- 45,56 ----
  		/>
  		
+ 		<property
+ 			name="demographicNo"
+ 			column="demographic_no"
+ 			type="integer"
+ 			not-null="false"			
+ 		/>
+ 		
+ 		
  		<many-to-one
  			name="demographic"
***************
*** 50,54 ****
  			class="org.oscarehr.common.model.Demographic"
  			not-null="false"
! 		>
  		</many-to-one>
  		<property
--- 58,62 ----
  			class="org.oscarehr.common.model.Demographic"
  			not-null="false"
! 			insert="false" update="false">		
  		</many-to-one>
  		<property

Index: TestBookRecord.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/TestBookRecord.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestBookRecord.java	1 Oct 2010 14:10:51 -0000	1.1
--- TestBookRecord.java	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 12,15 ****
--- 12,16 ----
  	private int appointmentNo;
  	private Demographic demographic;	
+ 	private int demographicNo;
  	private long eyeformId;
  	private String eye;
***************
*** 19,22 ****
--- 20,30 ----
  	
  	
+ 	
+ 	public int getDemographicNo() {
+ 		return demographicNo;
+ 	}
+ 	public void setDemographicNo(int demographicNo) {
+ 		this.demographicNo = demographicNo;
+ 	}
  	public Demographic getDemographic() {
  		return demographic;

--- NEW FILE: FollowUp.hbm.xml ---
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
	"-//Hibernate/Hibernate Mapping DTD//EN"
	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >

<hibernate-mapping package="org.oscarehr.eyeform.model">
	<class
		name="FollowUp"
		table="eyeform_followup"
	>
		<meta attribute="sync-DAO">false</meta>
		<id
			name="id"
			type="integer"
			column="id"
		>
			<generator class="native"/>
		</id>

		<property
			name="appointmentNo"
			column="appointment_no"
			type="integer"
			not-null="false"
		/>
		
		<property
			name="demographicNo"
			column="demographic_no"
			type="integer"
			not-null="false"
		/>
<!-- 		
		<many-to-one
			name="demographic"
			column="demographic_no"
			class="org.oscarehr.common.model.Demographic"
			not-null="false"
		>
		</many-to-one>
-->
		
		<property
			name="timespan"
			column="timespan"
			type="integer"
			not-null="false"			
		/>

		<property
			name="timeframe"
			column="timeframe"
			type="string"
			not-null="false"			
		/>
		
		<property
			name="followupProvider"
			column="followup_provider"
			type="string"
			not-null="false"			
		/>
		
		<!-- list of "templates" -->		
		
		<property
			name="date"
			column="date"
			type="timestamp"
			not-null="false"
			length="19"
		/>


		<many-to-one name="provider" class="org.oscarehr.common.model.Provider"
                        column="followup_provider" update="false" insert="false" lazy="false" />
                        
	</class>	
</hibernate-mapping>
--- NEW FILE: FollowUp.java ---
package org.oscarehr.eyeform.model;

import java.util.Date;

import org.oscarehr.common.model.Demographic;
import org.oscarehr.common.model.Provider;

public class FollowUp {

	private Integer id;
	private int appointmentNo;
	private Demographic demographic;
	private int demographicNo;	
	private int timespan;
	private String timeframe;
	private String followupProvider;
	private Date date;
	
	private String ack1;
	private String ack2;
	private String ack3;
	private Provider provider;
	
	
	public Provider getProvider() {
		return provider;
	}
	public void setProvider(Provider provider) {
		this.provider = provider;
	}
	public Integer getId() {
		return id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	public int getAppointmentNo() {
		return appointmentNo;
	}
	public void setAppointmentNo(int appointmentNo) {
		this.appointmentNo = appointmentNo;
	}
	public Demographic getDemographic() {
		return demographic;
	}
	public void setDemographic(Demographic demographic) {
		this.demographic = demographic;
	}
	public int getTimespan() {
		return timespan;
	}
	public void setTimespan(int timespan) {
		this.timespan = timespan;
	}
	public String getTimeframe() {
		return timeframe;
	}
	public void setTimeframe(String timeframe) {
		this.timeframe = timeframe;
	}
	public String getFollowupProvider() {
		return followupProvider;
	}
	public void setFollowupProvider(String followupProvider) {
		this.followupProvider = followupProvider;
	}
	public Date getDate() {
		return date;
	}
	public void setDate(Date date) {
		this.date = date;
	}
	public String getAck1() {
		return ack1;
	}
	public void setAck1(String ack1) {
		this.ack1 = ack1;
	}
	public String getAck2() {
		return ack2;
	}
	public void setAck2(String ack2) {
		this.ack2 = ack2;
	}
	public String getAck3() {
		return ack3;
	}
	public void setAck3(String ack3) {
		this.ack3 = ack3;
	}
	public int getDemographicNo() {
		return demographicNo;
	}
	public void setDemographicNo(int demographicNo) {
		this.demographicNo = demographicNo;
	}
	
	
	
}

Index: OcularProc.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/model/OcularProc.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OcularProc.java	1 Oct 2010 14:10:51 -0000	1.1
--- OcularProc.java	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 18,21 ****
--- 18,30 ----
  	private String location;
  	private Date updateTime;
+ 	private int appointmentNo;
+ 	
+ 	
+ 	public int getAppointmentNo() {
+ 		return appointmentNo;
+ 	}
+ 	public void setAppointmentNo(int appointmentNo) {
+ 		this.appointmentNo = appointmentNo;
+ 	}
  	public Integer getId() {
  		return id;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/eyeform followup.jsp, NONE, 1.1 current_note.jsp, 1.1, 1.2 exam.jsp, 1.1, 1.2 ocular_proc.jsp, 1.1, 1.2 procedure_book.jsp, 1.1, 1.2 specs_history.jsp, 1.1, 1.2 success.jsp, 1.1, 1.2 test_book.jsp, 1.1, 1.2

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32002/web/eyeform

Modified Files:
	current_note.jsp exam.jsp ocular_proc.jsp procedure_book.jsp 
	specs_history.jsp success.jsp test_book.jsp 
Added Files:
	followup.jsp 
Log Message:
eyeform updates


Index: test_book.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/test_book.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_book.jsp	1 Oct 2010 14:10:52 -0000	1.1
--- test_book.jsp	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 26,29 ****
--- 26,32 ----
  				
  		<html:hidden property="data.id"/>
+ 		<html:hidden property="data.demographicNo"/>		
+ 		<html:hidden property="data.appointmentNo"/>
+ 		
  		
  		<tr>

Index: ocular_proc.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/ocular_proc.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ocular_proc.jsp	1 Oct 2010 14:10:52 -0000	1.1
--- ocular_proc.jsp	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 26,29 ****
--- 26,30 ----
  		
  		<html:hidden property="proc.demographicNo"/>
+ 		<html:hidden property="proc.appointmentNo"/>
  		<html:hidden property="proc.id"/>
  		

Index: current_note.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/current_note.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** current_note.jsp	1 Oct 2010 14:10:52 -0000	1.1
--- current_note.jsp	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 1,3 ****
--- 1,7 ----
  <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+ <%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+ <%@ taglib prefix="display" uri="http://displaytag.sf.net"%>
+ 
+ 
  <c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/>	
  <script>
***************
*** 61,64 ****
--- 65,85 ----
  	
   }
+ 
+ 
+ function saveNoteAndSendTickler() {
+ 	//alert("save function called for eyeform - " + savedNoteId);
+ 	//do the ajax call to save form values 
+ 	
+ 	jQuery.ajax({
+ 		type: 'POST',
+ 		url: ctx+'/eyeform/NoteData.do?method=save',
+ 		data: jQuery("form[name='caseManagementEntryForm']").serialize(),
+ 		success: function (){alert('saved');},
+ 		dataType: 'html'	
+ 	});
+ 	
+ 	
+  }
+ 
  </script>
  
***************
*** 66,113 ****
  
  <table border="0">
!            <tbody><tr>
!             <td width="25%">Follow up:
  
!              <input name="followNo" value="4"  style="width: 25px;" class="special" type="text">
!              <select name="followFrame" style="width: 50px;" class="special">
!              	<option value="days" selected="selected">days</option>
!             	<option value="weeks">weeks</option>
!             	<option value="months">months</option>
!             </select>
!             </td> 
! 			<td width="45%">
!             Doctor:
              
!             <select property="internalNo">
!             	<c:forEach var="item" items="${internalList}">
!             		<option value="<c:out value="${item.providerNo}"/>"><c:out value="${item.formattedName}"/></option>
!             	</c:forEach>            	
! 			</select>
! 	  		
!             </td>
!             <td>
!             	
!             	 
!             	<input tabindex="236" style="width: 10%;" value="" id="ack1" name="ack1" onchange="setDischarge()" type="checkbox">
!             	
!             	discharge
!            <br>
              
-             	 
-             	<input tabindex="237" style="width: 10%;" checked="checked" id="ack2" value="checked" name="ack2" onchange="setSaveflag(true);setStat();" type="checkbox">
-             	
-             	
-             	STAT/PRN
-            <br>
- 
              
!             	
!             	 
!             	<input tabindex="240" style="width: 10%;" value="" id="ack3" name="ack3" onchange="setOpt();" type="checkbox">
!             	
!             	optom routine
!             </td>
!             </tr>
             </tbody>
  
  <% //book procedure, book test %>
--- 87,140 ----
  
  <table border="0">
!            <tbody>
!            
! <tr>
! <td colspan="3">
! <div>
  
!         <div>
              
!             <b>Follow Up/Consult:</b>
              
              
!             <span>&nbsp;&nbsp;</span>
! 			<%
! 				Integer noteId = (Integer)request.getAttribute("noteId");
! 				String aptNo = request.getParameter("appointmentNo");
! 				String demographicNo = request.getParameter("demographicNo");
! 			%>            
!             <a href="javascript:void(0)" onclick="popupPageOne('<c:out value="${ctx}"/>/eyeform/FollowUp.do?method=form&amp;followup.demographicNo=<%=demographicNo %>&amp;noteId=<%=noteId%>&amp;followup.appointmentNo=<%=aptNo%>','eyeFollowUp');">[arrange follow up/consult]</a>
!             &nbsp;            	
!         </div>
! 
!         <div>
!             <display:table name="requestScope.followUps"
!             requestURI="/EyeForm.do" class="display" id="tb" pagesize="5">
! 
!                 <display:setProperty name="paging.banner.one_item_found" value=""/>
!                 <display:setProperty name="paging.banner.all_items_found" value=""/>
!                 <display:setProperty name="paging.banner.some_items_found" value=""/>
!                 
!                 <display:column title="Time Span">
!                                         <c:out value="${tb.timespan}"/>
!                                 </display:column>
!                                 <display:column title="Time Frame">
!                                 <c:out value="${tb.timeframe}"/>
!                                 </display:column>
!                                 <display:column title="Date">
!                                 <c:out value="${tb.date}"/>
!                                 </display:column>
!                                 <display:column title="Provider">
!                                 <c:out value="${tb.provider.formattedName}"/>
!                                 </display:column>
!                                
! 			</display:table>           
!         </div>
! </div>
! </td>
! </tr>
! 
             </tbody>
+     
  
  <% //book procedure, book test %>
***************
*** 125,136 ****
              <span>&nbsp;&nbsp;</span>
  			<%
! 				Integer noteId = (Integer)request.getAttribute("noteId");
  			%>            
!             <a href="javascript:void(0)" onclick="popupPageOne('<c:out value="${ctx}"/>/eyeform/ProcedureBook.do?method=form&amp;appNo=4&amp;demographicNo=1&amp;noteId=<%=noteId%>','eyeProbook');">[arrange procedure]</a>
              &nbsp;            	
          </div>
  
          <div>
!             Nothing found to display.
          </div>
  </div>
--- 152,186 ----
              <span>&nbsp;&nbsp;</span>
  			<%
! 				noteId = (Integer)request.getAttribute("noteId");
  			%>            
!             <a href="javascript:void(0)" onclick="popupPageOne('<c:out value="${ctx}"/>/eyeform/ProcedureBook.do?method=form&amp;data.appointmentNo=<%=aptNo%>&amp;data.demographicNo=<%=demographicNo %>&amp;noteId=<%=noteId%>','eyeProbook');">[arrange procedure]</a>
              &nbsp;            	
          </div>
  
          <div>
! 			<display:table name="requestScope.procedures"
!             	requestURI="/EyeForm.do" class="display" id="tb" pagesize="5">
! 
!                 <display:setProperty name="paging.banner.one_item_found" value=""/>
!                 <display:setProperty name="paging.banner.all_items_found" value=""/>
!                 <display:setProperty name="paging.banner.some_items_found" value=""/>
!                 
!                  <display:column title="Procedure">
!                  	<c:out value="${tb.procedureName}"/>
!                  </display:column>
! 				<display:column title="Eye" >
! 		      		<c:out value="${tb.eye}"/>
! 				</display:column>
! 				<display:column title="Urgency" >
! 		      		<c:out value="${tb.urgency}"/>
! 				</display:column>
! 				<display:column title="Location" >
! 		      		<c:out value="${tb.location}"/>
! 				</display:column>
! 				<display:column title="comment" >
! 		      		<c:out value="${tb.comment}"/>
! 				</display:column>
! 				                 
!             </display:table>            
          </div>
  </div>
***************
*** 149,158 ****
              <span>&nbsp;&nbsp;</span>
              
!             <a href="javascript:void(0)" onclick="popupPageOne('<c:out value="${ctx}"/>/eyeform/TestBook.do?method=form&amp;appNo=4&amp;demographicNo=1','eyeProbook');">[arrange test]</a>
              	&nbsp;
              	
          </div>
          <div>
!             Nothing found to display.
          </div>
  
--- 199,227 ----
              <span>&nbsp;&nbsp;</span>
              
!             <a href="javascript:void(0)" onclick="popupPageOne('<c:out value="${ctx}"/>/eyeform/TestBook.do?method=form&amp;data.appointmentNo=<%=aptNo%>&amp;data.demographicNo=<%=demographicNo %>','eyeTestbook');">[arrange test]</a>
              	&nbsp;
              	
          </div>
          <div>
! 			<display:table name="requestScope.testBookRecords"
!             	requestURI="/EyeForm.do" class="display" id="tb2" pagesize="5">
! 
!                 <display:setProperty name="paging.banner.one_item_found" value=""/>
!                 <display:setProperty name="paging.banner.all_items_found" value=""/>
!                 <display:setProperty name="paging.banner.some_items_found" value=""/>
!                                  
!             	<display:column title="Test Name"  >
! 			   		<c:out value="${tb2.testname}"/>
! 				</display:column>
! 				<display:column title="Eye" >
! 		      		<c:out value="${tb2.eye}"/>
! 				</display:column>
! 				<display:column title="Urgency" >
! 		      		<c:out value="${tb2.urgency}"/>
! 				</display:column>
! 				<display:column title="comment" >
! 		      		<c:out value="${tb2.comment}"/>
! 				</display:column>
!             </display:table>                    
          </div>
  
***************
*** 186,190 ****
             <td width="15%">
              
! 			<input tabindex="251" value="send tickler" onclick="markTickler();touchColor();AjaxSubmitAction('sendEyeTickler');return false;" id="stickler" style="color: black;" type="submit">
  			 
              </td>
--- 255,259 ----
             <td width="15%">
              
! 			<input tabindex="251" value="Send Tickler" onclick="saveNoteAndSendTickler();return false;" id="stickler" style="color: black;" type="submit">
  			 
              </td>
***************
*** 200,203 ****
--- 269,277 ----
  
             
+            <tr>
+             <td nowrap="nowrap" width="40%">
+             	<input tabindex="251" value="Generate Note" onclick="AjaxSubmitAction('sendEyeNoTickler');return false;" id="stickler0" style="color: black;" type="submit">			
+             </td>
+            </tr>
             
        </table>

Index: exam.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/exam.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** exam.jsp	1 Oct 2010 14:10:52 -0000	1.1
--- exam.jsp	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 1,2 ****
--- 1,12 ----
+ <%@ page import="oscar.OscarProperties"%>
+ 
+ <%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+ 
+ <%
+ 	oscar.OscarProperties pros = oscar.OscarProperties.getInstance();
+ 	String fid = pros.getProperty("eyeform_diagram_eform");
+ 
+ %>
+ 
  <script>
  //if have value under slidy block set the color to brown
***************
*** 216,224 ****
  <div class="slidey">
          <div class="title">
!             <a style="font-weight: bold;" href="javascript:void(0)" tabindex="31" id="a_20" onclick="return;">Digital Photos:</a>            
          </div>
          <div class="title">
              <a style="font-weight: bold;" href="javascript:void(0)" tabindex="31" id="a_20" onclick="alert('Not yet implemented');">Diagrams:</a>            
          </div>
  </div>
  </td>
--- 226,241 ----
  <div class="slidey">
          <div class="title">
!             <a style="font-weight: bold;" href="javascript:void(0)" tabindex="31" id="a_19" onclick="togglediv(this);">Digital Photos:</a>            
!         </div>
!         <div id="s_19" class="slideblock">
! 	        <a href="#" onclick="window.open('<html:rewrite page="/dms/documentReport.jsp"/>?function=demographic&doctype=lab&functionid=14&curUser=<%=session.getAttribute("user")%>&mode=add&parentAjaxId=docs&appointment_no='+appointmentNo);return false;">Add Photos</a>
          </div>
+         
          <div class="title">
              <a style="font-weight: bold;" href="javascript:void(0)" tabindex="31" id="a_20" onclick="alert('Not yet implemented');">Diagrams:</a>            
          </div>
+         <div id="s_20" class="slideblock">
+             <a href="#" onclick="window.open('<html:rewrite page="/eform/efmformadd_data.jsp"/>?fid=<%=fid %>&demographic_no=<%=request.getParameter("demographic_no") %>&appointment=<%=request.getParameter("appointment_no") %>');return false;">Add Diagram</a>
+         </div>
  </div>
  </td>

Index: success.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/success.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** success.jsp	1 Oct 2010 14:10:52 -0000	1.1
--- success.jsp	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 3,7 ****
  <title>Ocular Module</title>
  <script>
! function c() {window.close();}
  </script>
  </head>
--- 3,7 ----
  <title>Ocular Module</title>
  <script>
! function c() {window.opener.location.reload();window.close();}
  </script>
  </head>

Index: specs_history.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/specs_history.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** specs_history.jsp	1 Oct 2010 14:10:52 -0000	1.1
--- specs_history.jsp	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 107,110 ****
--- 107,111 ----
  		
  		<html:hidden property="specs.demographicNo"/>
+ 		<html:hidden property="specs.appointmentNo"/>
  		<html:hidden property="specs.id"/>
  		

--- NEW FILE: followup.jsp ---
<%@page import="org.oscarehr.eyeform.model.SpecsHistory"%>


<%@ include file="/taglibs.jsp"%>


<html>
<head>
	<title></title>
	<link rel="stylesheet" type="text/css" href='<html:rewrite page="/jsCalendar/skins/aqua/theme.css" />' />

		<link rel="stylesheet" type="text/css" media="all" href="<%=request.getContextPath()%>/share/calendar/calendar.css" title="win2k-cold-1" />
		<script type="text/javascript" src="<%=request.getContextPath()%>/share/calendar/calendar.js"></script>
		<script type="text/javascript" src="<%=request.getContextPath()%>/share/calendar/lang/<bean:message key="global.javascript.calendar"/>"></script>
		<script type="text/javascript" src="<%=request.getContextPath()%>/share/calendar/calendar-setup.js"></script>
		
</head>
<body>
Follow Up/Consult
<br /><br /><br />

<html:form action="/eyeform/FollowUp.do">
 

		<input type="hidden" name="method" value="save"/>
		
		<html:hidden property="followup.demographicNo"/>
		
		<html:hidden property="followup.appointmentNo"/>
		
		
		<table border="0">
           <tbody><tr>
            <td width="25%">Follow up:

             <html:text property="followup.timespan" size="4"  styleId="width: 25px;" styleClass="special"/>
             <html:select property="followup.timeframe" styleId="width: 50px;" styleClass="special">
             	<html:option value="days">days</html:option>
            	<html:option value="weeks">weeks</html:option>
            	<html:option value="months">months</html:option>
            </html:select>
            </td> 
			<td width="45%">
            Doctor:
            
            <html:select property="followup.followupProvider">
            	<c:forEach var="item" items="${providers}">
            		<option value="<c:out value="${item.providerNo}"/>"><c:out value="${item.formattedName}"/></option>
            	</c:forEach>            	
			</html:select>
	  		
            </td>
            </tr>
            <tr>
            <td>
            	
            	 
            	<html:checkbox style="width: 10%;" value="checked" styleId="ack1" property="followup.ack1" onchange="setDischarge()" />
            	
            	discharge
           <br>
            
            	 
            	<html:checkbox style="width: 10%;" styleId="ack2" value="checked" property="followup.ack2" onchange="setSaveflag(true);setStat();" />
            	
            	
            	STAT/PRN
           <br>

            
            	
            	 
            	<html:checkbox style="width: 10%;" value="checked" styleId="ack3" property="followup.ack3" onchange="setOpt();" />
            	
            	optom routine
            </td>
            </tr>
            <tr>
            <td><br/><html:submit value="submit"/></td>
            </tr>
           </tbody>
			</table>
		
			

</html:form>

</body>
</html>

Index: procedure_book.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eyeform/procedure_book.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** procedure_book.jsp	1 Oct 2010 14:10:52 -0000	1.1
--- procedure_book.jsp	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 26,30 ****
--- 26,33 ----
  				
  		<html:hidden property="data.id"/>
+ 		<html:hidden property="data.demographicNo"/>		
+ 		<html:hidden property="data.appointmentNo"/>
  		
+ 						
  		<tr>
  			<td class="genericTableHeader">Procedure name</td>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/js/custom eyeform-cme.js, 1.1, 1.2

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32002/web/js/custom

Modified Files:
	eyeform-cme.js 
Log Message:
eyeform updates


Index: eyeform-cme.js
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/js/custom/eyeform-cme.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** eyeform-cme.js	1 Oct 2010 14:10:52 -0000	1.1
--- eyeform-cme.js	4 Nov 2010 06:25:17 -0000	1.2
***************
*** 1,14 ****
   
     jQuery(document).ready(function(){
  	   issueNoteUrls = {
! 			   divR1I1:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=SocHistory&title=" + socHistoryLabel + "&cmd=divR1I1",
!                divR1I2:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=MedHistory&title=" + medHistoryLabel + "&cmd=divR1I2",
!                divR2I1:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=Concerns&title=" + onGoingLabel + "&cmd=divR2I1",
!                divR2I2:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=Reminders&title=" + remindersLabel + "&cmd=divR2I2",
!                divR3I1:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=DiagnosticNotes&title=" + diagnosticNotesLabel + "&cmd=divR3I1",
!                divR3I2:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=PastOcularHistory&title=" + pastOcularHistoryLabel + "&cmd=divR3I2",
!                divR4I1:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=PatientLog&title=" + patientLogLabel + "&cmd=divR4I1",
!                divR4I2:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=OcularMedications&title=" + ocularMedicationsLabel + "&cmd=divR4I2"                                         
         };
         //add diagnostic notes, past ocular history, patient log, ocular medications
         //add a row       
--- 1,16 ----
   
     jQuery(document).ready(function(){
+ 	   
  	   issueNoteUrls = {
! 			   divR1I1:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=SocHistory&title=" + socHistoryLabel + "&cmd=divR1I1" ,
!                divR1I2:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=MedHistory&title=" + medHistoryLabel + "&cmd=divR1I2" ,
!                divR2I1:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=Concerns&title=" + onGoingLabel + "&cmd=divR2I1" ,
!                divR2I2:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=Reminders&title=" + remindersLabel + "&cmd=divR2I2" ,
!                divR3I1:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=DiagnosticNotes&title=" + diagnosticNotesLabel + "&cmd=divR3I1" + "&appointment_no="+appointmentNo,
!                divR3I2:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=PastOcularHistory&title=" + pastOcularHistoryLabel + "&cmd=divR3I2" + "&appointment_no="+appointmentNo,
!                divR4I1:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=OcularMedications&title=" + ocularMedicationsLabel + "&cmd=divR4I1" + "&appointment_no="+appointmentNo,
!                divR4I2:    ctx + "/CaseManagementView.do?hc=996633&method=listNotes&providerNo=" + providerNo + "&demographicNo=" + demographicNo + "&issue_code=PatientLog&title=" + ocularMedicationsLabel + "&cmd=divR4I2" + "&appointment_no="+appointmentNo
         };
+ 	   
         //add diagnostic notes, past ocular history, patient log, ocular medications
         //add a row       
***************
*** 43,47 ****
  
       
!        jQuery.ajax({url:ctx+"/eyeform/exam.jsp",dataType: "html",success: function(data) {
  			jQuery("#measurements_div").append(data);
  			//create comma separated list of the measurement types (from attribute)
--- 45,49 ----
  
       
!        jQuery.ajax({url:ctx+"/eyeform/exam.jsp?demographic_no="+demographicNo+"&appointment_no="+appointmentNo,dataType: "html",success: function(data) {
  			jQuery("#measurements_div").append(data);
  			//create comma separated list of the measurement types (from attribute)
***************
*** 61,68 ****
  
         init();
!       
!        
!       
!        jQuery.ajax({url:ctx+"/eyeform/NoteData.do?method=getCurrentNoteData&demographicNo="+demographicNo+"&noteId="+savedNoteId,dataType: "html",success: function(data) {
  			jQuery("#current_note_addon").append(data);
         }});
--- 63,68 ----
  
         init();
!                          
!        jQuery.ajax({url:ctx+"/eyeform/NoteData.do?method=getCurrentNoteData&demographicNo="+demographicNo+"&noteId="+savedNoteId+"&appointmentNo="+appointmentNo,dataType: "html",success: function(data) {
  			jQuery("#current_note_addon").append(data);
         }});
***************
*** 72,82 ****
         
  	   addLeftNavDiv("ocularprocedure");	                         
!        popColumn(ctx + "/oscarEncounter/displayOcularProcedure.do?hC=009999","ocularprocedure","ocularProcedure", "leftNavBar", this);
  
         addLeftNavDiv("specshistory");	                         
!        popColumn(ctx + "/oscarEncounter/displaySpecsHistory.do?hC=009999","specshistory","specsHistory", "leftNavBar", this);
         
         addLeftNavDiv("macro");	      
!        popColumn(ctx + "/oscarEncounter/displayMacro.do?hC=009999","macro","macro", "leftNavBar", this);
         
       });
--- 72,82 ----
         
  	   addLeftNavDiv("ocularprocedure");	                         
!        popColumn(ctx + "/oscarEncounter/displayOcularProcedure.do?hC=009999&appointment_no="+appointmentNo,"ocularprocedure","ocularProcedure", "leftNavBar", this);
  
         addLeftNavDiv("specshistory");	                         
!        popColumn(ctx + "/oscarEncounter/displaySpecsHistory.do?hC=009999&appointment_no="+appointmentNo,"specshistory","specsHistory", "leftNavBar", this);
         
         addLeftNavDiv("macro");	      
!        popColumn(ctx + "/oscarEncounter/displayMacro.do?hC=009999&appointment_no="+appointmentNo,"macro","macro", "leftNavBar", this);
         
       });

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/dms addDocument.jsp, 1.15, 1.16 documentReport.jsp, 1.50, 1.51

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32002/web/dms

Modified Files:
	addDocument.jsp documentReport.jsp 
Log Message:
eyeform updates


Index: addDocument.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms/addDocument.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** addDocument.jsp	18 Aug 2010 06:33:06 -0000	1.15
--- addDocument.jsp	4 Nov 2010 06:25:16 -0000	1.16
***************
*** 37,40 ****
--- 37,41 ----
  <%
  String user_no = (String) session.getAttribute("user");
+ String appointment = request.getParameter("appointment_no");
  
  String module = "";
***************
*** 99,102 ****
--- 100,104 ----
      formdata.setObservationDate(UtilDateUtilities.DateToString(UtilDateUtilities.now(), "yyyy/MM/dd"));
      formdata.setHtml(defaultHtml);
+     formdata.setAppointment(appointment);
  }
  ArrayList doctypes = EDocUtil.getDoctypes(formdata.getFunction());

Index: documentReport.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms/documentReport.jsp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** documentReport.jsp	18 Aug 2010 11:08:19 -0000	1.50
--- documentReport.jsp	4 Nov 2010 06:25:16 -0000	1.51
***************
*** 36,39 ****
--- 36,40 ----
  
  String annotation_display = org.oscarehr.casemgmt.model.CaseManagementNoteLink.DISP_DOCUMENT;
+ String appointment = request.getParameter("appointment_no");
  %>
  

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms EDoc.java, 1.22, 1.23 EDocUtil.java, 1.67, 1.68

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32002/web/WEB-INF/classes/src/oscar/dms

Modified Files:
	EDoc.java EDocUtil.java 
Log Message:
eyeform updates


Index: EDoc.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/EDoc.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** EDoc.java	9 Jul 2010 21:56:39 -0000	1.22
--- EDoc.java	4 Nov 2010 06:25:16 -0000	1.23
***************
*** 67,71 ****
  	private boolean indivoRegistered = false;
  	private int numberOfPages = 0;
! 
  	/** Creates a new instance of EDoc */
  	public EDoc() {
--- 67,72 ----
  	private boolean indivoRegistered = false;
  	private int numberOfPages = 0;
! 	private Integer appointmentNo = -1;
! 	
  	/** Creates a new instance of EDoc */
  	public EDoc() {
***************
*** 360,363 ****
--- 361,374 ----
  		this.programId = programId;
  	}
+ 	
+ 	
+ 
+ 	public Integer getAppointmentNo() {
+ 		return appointmentNo;
+ 	}
+ 
+ 	public void setAppointmentNo(Integer appointmentNo) {
+ 		this.appointmentNo = appointmentNo;
+ 	}
  
  	public Date getDateTimeStampAsDate() {

Index: EDocUtil.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/EDocUtil.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** EDocUtil.java	6 Oct 2010 08:45:26 -0000	1.67
--- EDocUtil.java	4 Nov 2010 06:25:16 -0000	1.68
***************
*** 135,140 ****
       */
      public static String addDocumentSQL(EDoc newDocument) {
!         String preparedSQL = "INSERT INTO document (doctype, docdesc, docxml, docfilename, doccreator, source, responsible, program_id, updatedatetime, status, contenttype, public1, observationdate,number_of_pages) VALUES (?,?,?, ?,?,?, ?,?,?, ?,?,?,?,?)";
!         DBPreparedHandlerParam[] param = new DBPreparedHandlerParam[14];
          int counter = 0;
          param[counter++] = new DBPreparedHandlerParam(newDocument.getType());
--- 135,140 ----
       */
      public static String addDocumentSQL(EDoc newDocument) {
!         String preparedSQL = "INSERT INTO document (doctype, docdesc, docxml, docfilename, doccreator, source, responsible, program_id, updatedatetime, status, contenttype, public1, observationdate,number_of_pages,appointment_no) VALUES (?,?,?, ?,?,?, ?,?,?, ?,?,?,?,?,?)";
!         DBPreparedHandlerParam[] param = new DBPreparedHandlerParam[15];
          int counter = 0;
          param[counter++] = new DBPreparedHandlerParam(newDocument.getType());
***************
*** 156,159 ****
--- 156,160 ----
          param[counter++] = new DBPreparedHandlerParam(od2);
          param[counter++] = new DBPreparedHandlerParam(newDocument.getNumberOfPages());
+         param[counter++] = new DBPreparedHandlerParam(newDocument.getAppointmentNo());
  
          /*
***************
*** 246,253 ****
       */
      public static ArrayList<EDoc> listDocs(String demoNo, String consultationId, boolean attached) {
!         String sql = "SELECT DISTINCT d.document_no, d.doccreator, d.source, d.responsible, d.program_id, d.doctype, d.docdesc, d.observationdate, d.status, d.docfilename, d.contenttype, d.reviewer, d.reviewdatetime FROM document d, ctl_document c "
                  + "WHERE d.status=c.status AND d.status != 'D' AND c.document_no=d.document_no AND " + "c.module='demographic' AND c.module_id = " + demoNo;
  
!         String attachQuery = "SELECT d.document_no, d.doccreator, d.source, d.responsible, d.program_id, d.doctype, d.docdesc, d.observationdate, d.status, d.docfilename, d.contenttype, d.reviewer, d.reviewdatetime FROM document d, consultdocs cd " +
  		"WHERE d.document_no = cd.document_no AND " + "cd.requestId = "+consultationId+" AND cd.doctype = 'D' AND cd.deleted IS NULL";
  
--- 247,254 ----
       */
      public static ArrayList<EDoc> listDocs(String demoNo, String consultationId, boolean attached) {
!         String sql = "SELECT DISTINCT d.document_no, d.doccreator, d.source, d.responsible, d.program_id, d.doctype, d.docdesc, d.observationdate, d.status, d.docfilename, d.contenttype, d.reviewer, d.reviewdatetime, d.appointment_no FROM document d, ctl_document c "
                  + "WHERE d.status=c.status AND d.status != 'D' AND c.document_no=d.document_no AND " + "c.module='demographic' AND c.module_id = " + demoNo;
  
!         String attachQuery = "SELECT d.document_no, d.doccreator, d.source, d.responsible, d.program_id, d.doctype, d.docdesc, d.observationdate, d.status, d.docfilename, d.contenttype, d.reviewer, d.reviewdatetime, d.appointment_no FROM document d, consultdocs cd " +
  		"WHERE d.document_no = cd.document_no AND " + "cd.requestId = "+consultationId+" AND cd.doctype = 'D' AND cd.deleted IS NULL";
  
***************
*** 268,271 ****
--- 269,274 ----
                  String temp = rsGetString(rs, "program_id");
                  if (temp != null && temp.length()>0) currentdoc.setProgramId(Integer.valueOf(temp));
+                 temp = rsGetString(rs, "appointment_no");
+                 if (temp != null && temp.length()>0) currentdoc.setAppointmentNo(Integer.valueOf(temp));
                  currentdoc.setType(rsGetString(rs, "doctype"));
                  currentdoc.setStatus(rsGetString(rs, "status").charAt(0));
***************
*** 290,293 ****
--- 293,298 ----
                      String temp = rsGetString(rs, "program_id");
                      if (temp != null && temp.length()>0) currentdoc.setProgramId(Integer.valueOf(temp));
+                     temp = rsGetString(rs, "appointment_no");
+                     if (temp != null && temp.length()>0) currentdoc.setAppointmentNo(Integer.valueOf(temp));
                      currentdoc.setType(rsGetString(rs, "doctype"));
                      currentdoc.setStatus(rsGetString(rs, "status").charAt(0));
***************
*** 320,324 ****
      public static EDoc getEDocFromDocId(String docId){
           String sql = "SELECT DISTINCT c.module, c.module_id, d.doccreator, d.source, d.responsible, d.program_id, "
!                 + "d.status, d.docdesc, d.docfilename, d.doctype, d.document_no, d.updatedatetime, d.contenttype, d.observationdate, d.reviewer, d.reviewdatetime " +
  		"FROM document d, ctl_document c WHERE "
                  + " c.document_no=d.document_no AND c.document_no='" + docId + "'";
--- 325,329 ----
      public static EDoc getEDocFromDocId(String docId){
           String sql = "SELECT DISTINCT c.module, c.module_id, d.doccreator, d.source, d.responsible, d.program_id, "
!                 + "d.status, d.docdesc, d.docfilename, d.doctype, d.document_no, d.updatedatetime, d.contenttype, d.observationdate, d.reviewer, d.reviewdatetime, d.appointment_no " +
  		"FROM document d, ctl_document c WHERE "
                  + " c.document_no=d.document_no AND c.document_no='" + docId + "'";
***************
*** 340,343 ****
--- 345,350 ----
                  String temp = rsGetString(rs, "program_id");
                  if (temp != null && temp.length()>0) currentdoc.setProgramId(Integer.valueOf(temp));
+                 temp = rsGetString(rs, "appointment_no");
+                 if (temp != null && temp.length()>0) currentdoc.setAppointmentNo(Integer.valueOf(temp));
                  currentdoc.setDateTimeStamp(rsGetString(rs, "updatedatetime"));
                  currentdoc.setFileName(rsGetString(rs, "docfilename"));
***************
*** 373,377 ****
          // select publicDoc and sorting from static variables for this class i.e. sort=EDocUtil.SORT_OBSERVATIONDATE
          // sql base (prefix) to avoid repetition in the if-statements
!         String sql = "SELECT DISTINCT c.module, c.module_id, d.doccreator, d.source, d.responsible, d.program_id, d.status, d.docdesc, d.docfilename, d.doctype, d.document_no, d.updatedatetime, d.contenttype, d.observationdate, d.reviewer, d.reviewdatetime " +
  		"FROM document d, ctl_document c WHERE c.document_no=d.document_no AND c.module='" + module + "'";
          // if-statements to select the where condition (suffix)
--- 380,384 ----
          // select publicDoc and sorting from static variables for this class i.e. sort=EDocUtil.SORT_OBSERVATIONDATE
          // sql base (prefix) to avoid repetition in the if-statements
!         String sql = "SELECT DISTINCT c.module, c.module_id, d.doccreator, d.source, d.responsible, d.program_id, d.status, d.docdesc, d.docfilename, d.doctype, d.document_no, d.updatedatetime, d.contenttype, d.observationdate, d.reviewer, d.reviewdatetime, d.appointment_no " +
  		"FROM document d, ctl_document c WHERE c.document_no=d.document_no AND c.module='" + module + "'";
          // if-statements to select the where condition (suffix)
***************
*** 408,411 ****
--- 415,420 ----
                  String temp = rsGetString(rs, "program_id");
                  if (temp != null && temp.length()>0) currentdoc.setProgramId(Integer.valueOf(temp));
+                 temp = rsGetString(rs, "appointment_no");
+                 if (temp != null && temp.length()>0) currentdoc.setAppointmentNo(Integer.valueOf(temp));
                  currentdoc.setDateTimeStamp(rsGetString(rs, "updatedatetime"));
                  currentdoc.setFileName(rsGetString(rs, "docfilename"));
***************
*** 433,437 ****
         ArrayList<EDoc> list = new ArrayList();
         //boolean matchedDemographics = true;
!        String sql= "SELECT DISTINCT c.module, c.module_id, d.doccreator, d.source, d.responsible, d.program_id, d.status, d.docdesc, d.docfilename, d.doctype, d.document_no, d.updatedatetime, d.contenttype, d.observationdate FROM document d, ctl_document c WHERE c.document_no=d.document_no AND c.module='demographic' and doccreator = ? and responsible = ? and updatedatetime >= ?  and updatedatetime <= ?";
         if (unmatchedDemographics){
             sql += " and c.module_id = -1 ";
--- 442,446 ----
         ArrayList<EDoc> list = new ArrayList();
         //boolean matchedDemographics = true;
!        String sql= "SELECT DISTINCT c.module, c.module_id, d.doccreator, d.source, d.responsible, d.program_id, d.status, d.docdesc, d.docfilename, d.doctype, d.document_no, d.updatedatetime, d.contenttype, d.observationdate, d.appointment_no FROM document d, ctl_document c WHERE c.document_no=d.document_no AND c.module='demographic' and doccreator = ? and responsible = ? and updatedatetime >= ?  and updatedatetime <= ?";
         if (unmatchedDemographics){
             sql += " and c.module_id = -1 ";
***************
*** 465,468 ****
--- 474,479 ----
                  String temp = rsGetString(rs, "program_id");
                  if (temp != null && temp.length()>0) currentdoc.setProgramId(Integer.valueOf(temp));
+                 temp = rsGetString(rs, "appointment_no");
+                 if (temp != null && temp.length()>0) currentdoc.setAppointmentNo(Integer.valueOf(temp));
                  currentdoc.setDateTimeStamp(rsGetString(rs, "updatedatetime"));
                  currentdoc.setFileName(rsGetString(rs, "docfilename"));
***************
*** 508,511 ****
--- 519,524 ----
                  String temp = rsGetString(rs, "program_id");
                  if (temp != null && temp.length()>0) currentdoc.setProgramId(Integer.valueOf(temp));
+                 temp = rsGetString(rs, "appointment_no");
+                 if (temp != null && temp.length()>0) currentdoc.setAppointmentNo(Integer.valueOf(temp));
                  currentdoc.setDateTimeStamp(rsGetString(rs, "updatedatetime"));
                  currentdoc.setContentType(rsGetString(rs, "contenttype"));

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web FollowUpAction.java, NONE, 1.1 NoteAddonAction.java, 1.2, 1.3 OcularProcAction.java, 1.1, 1.2

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32002/web/WEB-INF/classes/src/org/oscarehr/eyeform/web

Modified Files:
	NoteAddonAction.java OcularProcAction.java 
Added Files:
	FollowUpAction.java 
Log Message:
eyeform updates


Index: NoteAddonAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/NoteAddonAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NoteAddonAction.java	1 Oct 2010 18:42:43 -0000	1.2
--- NoteAddonAction.java	4 Nov 2010 06:25:16 -0000	1.3
***************
*** 1,4 ****
--- 1,6 ----
  package org.oscarehr.eyeform.web;
  
+ import java.util.List;
+ 
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
***************
*** 9,12 ****
--- 11,20 ----
  import org.apache.struts.actions.DispatchAction;
  import org.oscarehr.PMmodule.dao.ProviderDao;
+ import org.oscarehr.eyeform.dao.FollowUpDao;
+ import org.oscarehr.eyeform.dao.ProcedureBookDao;
+ import org.oscarehr.eyeform.dao.TestBookRecordDao;
+ import org.oscarehr.eyeform.model.FollowUp;
+ import org.oscarehr.eyeform.model.ProcedureBook;
+ import org.oscarehr.eyeform.model.TestBookRecord;
  import org.oscarehr.util.SpringUtils;
  
***************
*** 18,25 ****
--- 26,47 ----
  		String demographicNo = request.getParameter("demographicNo");
  		String noteId = request.getParameter("noteId");
+ 		String appointmentNo = request.getParameter("appointmentNo");
  		
  		request.setAttribute("internalList", providerDao.getActiveProviders());
  
  		//load up tests/procedures and extra info
+ 		FollowUpDao followUpDao = (FollowUpDao)SpringUtils.getBean("FollowUpDAO");
+ 		TestBookRecordDao testDao = (TestBookRecordDao)SpringUtils.getBean("TestBookDAO");
+ 		ProcedureBookDao procedureBookDao = (ProcedureBookDao)SpringUtils.getBean("ProcedureBookDAO");
+ 		
+ 		List<FollowUp> followUps = followUpDao.getByAppointmentNo(Integer.parseInt(appointmentNo));
+ 		request.setAttribute("followUps",followUps);
+ 		
+ 		List<TestBookRecord> testBookRecords = testDao.getByAppointmentNo(Integer.parseInt(appointmentNo));
+ 		request.setAttribute("testBookRecords",testBookRecords);
+ 		
+ 		List<ProcedureBook> procedures = procedureBookDao.getByAppointmentNo(Integer.parseInt(appointmentNo));
+ 		request.setAttribute("procedures",procedures);
+ 		
  		
  		
***************
*** 37,41 ****
  	 * procedure/test
  	 */
! 	public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {		
  		return null;
  	}
--- 59,63 ----
  	 * procedure/test
  	 */
! 	public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
  		return null;
  	}

Index: OcularProcAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/web/OcularProcAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OcularProcAction.java	1 Oct 2010 14:10:51 -0000	1.1
--- OcularProcAction.java	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 48,52 ****
      	OcularProcDao dao = (OcularProcDao)SpringUtils.getBean("OcularProcDAO");
      	procedure.setProvider(LoggedInInfo.loggedInInfo.get().loggedInProvider.getProviderNo());	
!     	
      	dao.save(procedure);
      	
--- 48,53 ----
      	OcularProcDao dao = (OcularProcDao)SpringUtils.getBean("OcularProcDAO");
      	procedure.setProvider(LoggedInInfo.loggedInInfo.get().loggedInProvider.getProviderNo());	
!     	if(procedure.getId() == 0)
!     		procedure.setId(null);
      	dao.save(procedure);
      	

--- NEW FILE: FollowUpAction.java ---
package org.oscarehr.eyeform.web;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.actions.DispatchAction;
import org.apache.struts.validator.DynaValidatorForm;
import org.oscarehr.PMmodule.dao.ProviderDao;
import org.oscarehr.eyeform.dao.FollowUpDao;
import org.oscarehr.eyeform.model.FollowUp;
import org.oscarehr.util.LoggedInInfo;
import org.oscarehr.util.SpringUtils;

public class FollowUpAction extends DispatchAction {

	public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
        return form(mapping, form, request, response);
    }

    public ActionForward cancel(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
        return form(mapping, form, request, response);
    }

    public ActionForward form(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
    	ProviderDao providerDao = (ProviderDao)SpringUtils.getBean("providerDao");
    	request.setAttribute("providers",providerDao.getActiveProviders());
    	
    	
    	/*
    	ProcedureBookDao dao = (ProcedureBookDao)SpringUtils.getBean("ProcedureBookDAO");
    	
    	
    	DynaValidatorForm f = (DynaValidatorForm)form;
    	ProcedureBook data = (ProcedureBook)f.get("data");
    	if(data.getId() != null && data.getId().intValue()>0) {
    		data = dao.find(data.getId()); 
    	}
    	
    	f.set("data", data);
    */	        
        return mapping.findForward("form");
    }
    
    public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {    	
    	DynaValidatorForm f = (DynaValidatorForm)form;
    	FollowUp data = (FollowUp)f.get("followup");
    	if(data.getId()!=null && data.getId()==0) {
    		data.setId(null);
    	}
    	FollowUpDao dao = (FollowUpDao)SpringUtils.getBean("FollowUpDAO");
    	//data.setProvider(LoggedInInfo.loggedInInfo.get().loggedInProvider.getProviderNo());	
    	dao.save(data);
    	
    	
    	return mapping.findForward("success");
    }
}

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/casemgmt newEncounterLayout.jsp, 1.50, 1.51

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32002/web/casemgmt

Modified Files:
	newEncounterLayout.jsp 
Log Message:
eyeform updates


Index: newEncounterLayout.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/newEncounterLayout.jsp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** newEncounterLayout.jsp	1 Oct 2010 14:10:52 -0000	1.50
--- newEncounterLayout.jsp	4 Nov 2010 06:25:16 -0000	1.51
***************
*** 176,185 ****
         }
  
!           
     </script>
   
     
     <%
!    
   	String customScript = (String)request.getAttribute("cme_js");
     if(customScript != null && customScript.length()>0) {
--- 176,187 ----
         }
  
! 
!        var appointmentNo = <%=request.getParameter("appointmentNo")%>;
!               
     </script>
   
     
     <%
!       
   	String customScript = (String)request.getAttribute("cme_js");
     if(customScript != null && customScript.length()>0) {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/data AddEditDocumentForm.java, 1.8, 1.9

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/data
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32002/web/WEB-INF/classes/src/oscar/dms/data

Modified Files:
	AddEditDocumentForm.java 
Log Message:
eyeform updates


Index: AddEditDocumentForm.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/data/AddEditDocumentForm.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AddEditDocumentForm.java	13 Mar 2009 20:38:16 -0000	1.8
--- AddEditDocumentForm.java	4 Nov 2010 06:25:16 -0000	1.9
***************
*** 46,49 ****
--- 46,51 ----
      private String html = "";
      
+     private String appointment = "";
+     
      public AddEditDocumentForm() {
      }
***************
*** 176,179 ****
--- 178,190 ----
          this.filedata = Filedata;
      }
+ 
+ 	public String getAppointment() {
+ 		return appointment;
+ 	}
+ 
+ 	public void setAppointment(String appointment) {
+ 		this.appointment = appointment;
+ 	}
+     
      
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/actions AddEditDocumentAction.java, 1.32, 1.33

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/actions
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32002/web/WEB-INF/classes/src/oscar/dms/actions

Modified Files:
	AddEditDocumentAction.java 
Log Message:
eyeform updates


Index: AddEditDocumentAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/actions/AddEditDocumentAction.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** AddEditDocumentAction.java	18 Aug 2010 06:33:06 -0000	1.32
--- AddEditDocumentAction.java	4 Nov 2010 06:25:16 -0000	1.33
***************
*** 231,234 ****
--- 231,238 ----
  			if (programIdStr != null) newDoc.setProgramId(Integer.valueOf(programIdStr));
  
+ 			// if the document was added in the context of an appointment
+ 			if(fm.getAppointment() != null && fm.getAppointment().length()>0) {
+ 				newDoc.setAppointmentNo(Integer.parseInt(fm.getAppointment()));
+ 			}
  			// ---
  			String doc_no = EDocUtil.addDocumentSQL(newDoc);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao FollowUpDao.java, NONE, 1.1 OcularProcDao.java, 1.1, 1.2 ProcedureBookDao.java, 1.1, 1.2 SpecsHistoryDao.java, 1.1, 1.2 TestBookRecordDao.java, 1.1, 1.2

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32002/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao

Modified Files:
	OcularProcDao.java ProcedureBookDao.java SpecsHistoryDao.java 
	TestBookRecordDao.java 
Added Files:
	FollowUpDao.java 
Log Message:
eyeform updates


Index: TestBookRecordDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao/TestBookRecordDao.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestBookRecordDao.java	1 Oct 2010 14:10:51 -0000	1.1
--- TestBookRecordDao.java	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 1,4 ****
--- 1,6 ----
  package org.oscarehr.eyeform.dao;
  
+ import java.util.List;
+ 
  import org.oscarehr.eyeform.model.TestBookRecord;
  import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
***************
*** 9,17 ****
  		this.getHibernateTemplate().saveOrUpdate(obj);
  	}
! 	/*
! 	public List<ProcedureBook> getByDemographicNo(int demographicNo) {
! 		return getHibernateTemplate().find("from OcularProc op where op.demographicNo = ?",demographicNo);
  	}
! 	*/
  	
  	public TestBookRecord find(int id) {
--- 11,19 ----
  		this.getHibernateTemplate().saveOrUpdate(obj);
  	}
! 	
! 	public List<TestBookRecord> getByAppointmentNo(int appointmentNo) {
! 		return getHibernateTemplate().find("from TestBookRecord t where t.appointmentNo = ?",appointmentNo);
  	}
! 	
  	
  	public TestBookRecord find(int id) {

Index: OcularProcDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao/OcularProcDao.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OcularProcDao.java	1 Oct 2010 14:10:51 -0000	1.1
--- OcularProcDao.java	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 18,21 ****
--- 18,25 ----
  	}
  	
+ 	public List<OcularProc> getByAppointmentNo(int appointmentNo) {
+ 		return getHibernateTemplate().find("from OcularProc op where op.appointmentNo = ?",appointmentNo);
+ 	}
+ 	
  	public OcularProc find(int id) {
  		return (OcularProc)getHibernateTemplate().get(OcularProc.class, id);

Index: SpecsHistoryDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao/SpecsHistoryDao.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SpecsHistoryDao.java	1 Oct 2010 14:10:51 -0000	1.1
--- SpecsHistoryDao.java	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 18,21 ****
--- 18,25 ----
  	}
  	
+ 	public List<SpecsHistory> getByAppointmentNo(int appointmentNo) {
+ 		return getHibernateTemplate().find("from SpecsHistory sh where sh.appointmentNo = ? order by sh.date desc",appointmentNo);
+ 	}
+ 	
  	public SpecsHistory find(int id) {
  		return (SpecsHistory)getHibernateTemplate().get(SpecsHistory.class, id);

Index: ProcedureBookDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/eyeform/dao/ProcedureBookDao.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ProcedureBookDao.java	1 Oct 2010 14:10:51 -0000	1.1
--- ProcedureBookDao.java	4 Nov 2010 06:25:16 -0000	1.2
***************
*** 1,4 ****
--- 1,6 ----
  package org.oscarehr.eyeform.dao;
  
+ import java.util.List;
+ 
  import org.oscarehr.eyeform.model.ProcedureBook;
  import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
***************
*** 9,17 ****
  		this.getHibernateTemplate().saveOrUpdate(obj);
  	}
! 	/*
! 	public List<ProcedureBook> getByDemographicNo(int demographicNo) {
! 		return getHibernateTemplate().find("from OcularProc op where op.demographicNo = ?",demographicNo);
  	}
! 	*/
  	
  	public ProcedureBook find(int id) {
--- 11,19 ----
  		this.getHibernateTemplate().saveOrUpdate(obj);
  	}
! 	
! 	public List<ProcedureBook> getByAppointmentNo(int appointmentNo) {
! 		return getHibernateTemplate().find("from ProcedureBook p where p.appointmentNo = ?",appointmentNo);
  	}
! 	
  	
  	public ProcedureBook find(int id) {

--- NEW FILE: FollowUpDao.java ---
package org.oscarehr.eyeform.dao;

import java.util.List;

import org.oscarehr.eyeform.model.FollowUp;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;

public class FollowUpDao extends HibernateDaoSupport {

	public void save(FollowUp obj) {		
		this.getHibernateTemplate().saveOrUpdate(obj);
	}
	/*
	public List<ProcedureBook> getByDemographicNo(int demographicNo) {
		return getHibernateTemplate().find("from OcularProc op where op.demographicNo = ?",demographicNo);
	}
	*/
	
	public FollowUp find(int id) {
		return (FollowUp)getHibernateTemplate().get(FollowUp.class, id);
	}
	
	public List<FollowUp> getByAppointmentNo(int appointmentNo) {
		return this.getHibernateTemplate().find("FROM FollowUp fu WHERE fu.appointmentNo = ?",appointmentNo);
	}
}