You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(95) |
Dec
(207) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(106) |
Feb
(69) |
Mar
(78) |
Apr
(65) |
May
(118) |
Jun
(121) |
Jul
(190) |
Aug
(95) |
Sep
(160) |
Oct
(114) |
Nov
(85) |
Dec
(79) |
| 2006 |
Jan
(103) |
Feb
(89) |
Mar
(41) |
Apr
(122) |
May
(94) |
Jun
(62) |
Jul
(491) |
Aug
(95) |
Sep
(279) |
Oct
(167) |
Nov
(156) |
Dec
(624) |
| 2007 |
Jan
(364) |
Feb
(271) |
Mar
(315) |
Apr
(378) |
May
(193) |
Jun
(235) |
Jul
(548) |
Aug
(388) |
Sep
(725) |
Oct
(369) |
Nov
(322) |
Dec
(487) |
| 2008 |
Jan
(552) |
Feb
(628) |
Mar
(817) |
Apr
(746) |
May
(1224) |
Jun
(1971) |
Jul
(1191) |
Aug
(876) |
Sep
(491) |
Oct
(267) |
Nov
(354) |
Dec
(747) |
| 2009 |
Jan
(322) |
Feb
(442) |
Mar
(573) |
Apr
(303) |
May
(401) |
Jun
(340) |
Jul
(403) |
Aug
(238) |
Sep
(267) |
Oct
(347) |
Nov
(456) |
Dec
(184) |
| 2010 |
Jan
(246) |
Feb
(432) |
Mar
(598) |
Apr
(250) |
May
(498) |
Jun
(715) |
Jul
(1282) |
Aug
(350) |
Sep
(504) |
Oct
(632) |
Nov
(870) |
Dec
(170) |
| 2011 |
Jan
(206) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jai <yg...@us...> - 2010-11-06 19:38:02
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22747 Modified Files: Tag: RELEASE_10_06 QueueDocumentLinkDao.java Log Message: - ID: 3104263 -set status to inactive -get active queue and document link Index: QueueDocumentLinkDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/QueueDocumentLinkDao.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** QueueDocumentLinkDao.java 23 Jun 2010 14:49:40 -0000 1.2 --- QueueDocumentLinkDao.java 6 Nov 2010 19:37:54 -0000 1.2.2.1 *************** *** 27,33 **** import java.util.List; import org.springframework.dao.support.DataAccessUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - import org.oscarehr.common.model.QueueDocumentLink; /** --- 27,36 ---- import java.util.List; + import org.oscarehr.common.model.Queue; + + import org.oscarehr.common.model.QueueDocumentLink; + import org.oscarehr.util.MiscUtils; import org.springframework.dao.support.DataAccessUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; /** *************** *** 41,44 **** --- 44,51 ---- return queues; } + public List getActiveQueueDocLink(){ + return this.getHibernateTemplate().find("from QueueDocumentLink where status=?",new Object[]{"A"}); + } + public List getQueueFromDocument(Integer docId){ List queues = this.getHibernateTemplate().find("from QueueDocumentLink where docId = ?",new Object[] {docId}); *************** *** 59,65 **** return false; } ! public void addToQueueDocumentLink(Integer qId,Integer dId){ - System.out.println("Add to QueueDocumentLink"); try{ if(!hasQueueBeenLinkedWithDocument(dId,qId)){ --- 66,85 ---- return false; } ! public boolean setStatusInactive(Integer docId){ ! List<QueueDocumentLink> qs=getQueueFromDocument(docId); ! if(qs.size()>0){ ! QueueDocumentLink q=qs.get(0); ! if(!q.getStatus().equals("I")){ ! q.setStatus("I"); ! this.getHibernateTemplate().update(q); ! return true; ! }else{ ! return false; ! } ! }return false; ! //if status is not I, change to I ! //if status is I, do nothing ! } public void addToQueueDocumentLink(Integer qId,Integer dId){ try{ if(!hasQueueBeenLinkedWithDocument(dId,qId)){ *************** *** 70,74 **** } }catch(Exception e){ ! e.printStackTrace(); } } --- 90,94 ---- } }catch(Exception e){ ! MiscUtils.getLogger().error("Error", e); } } |
|
From: jai <yg...@us...> - 2010-11-06 19:37:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22693 Modified Files: Tag: RELEASE_10_06 QueueDao.java Log Message: - ID: 3104263 -add getQueuesHashtable(); Index: QueueDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/QueueDao.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** QueueDao.java 23 Jul 2010 18:47:25 -0000 1.1.2.1 --- QueueDao.java 6 Nov 2010 19:37:25 -0000 1.1.2.2 *************** *** 24,27 **** --- 24,38 ---- } + public Hashtable getQueuesHashtable(){ + String q="select q from Queue q"; + Query query=entityManager.createQuery(q); + List<Queue> result=new ArrayList(); + result=query.getResultList(); + Hashtable ht=new Hashtable(); + for(Queue que:result){ + ht.put(que.getId(),que.getName()); + } + return ht; + } public List<Hashtable> getQueues(){ String q="select q from Queue q"; *************** *** 53,57 **** Query query=entityManager.createQuery(q); Queue result=(Queue)query.getSingleResult(); - System.out.println(result); if(result!=null){ return result.getName(); --- 64,67 ---- |
|
From: jai <yg...@us...> - 2010-11-06 19:37:30
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22669 Modified Files: Tag: RELEASE_10_06 DocumentResultsDao.java Log Message: - ID: 3104263 -prevent null pointer exception Index: DocumentResultsDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/DocumentResultsDao.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** DocumentResultsDao.java 22 Oct 2010 22:19:17 -0000 1.1.2.3 --- DocumentResultsDao.java 6 Nov 2010 19:37:22 -0000 1.1.2.4 *************** *** 47,54 **** if(r!=null && r.size()>0){ ProviderInboxItem pii=r.get(r.size()-1); ! if(pii.getProviderNo().equals("000000"))//takes care of case when a provider number is 000000 return true; else{ ! int pn = Integer.parseInt(pii.getProviderNo()); if(pn>0){ return true; --- 47,57 ---- if(r!=null && r.size()>0){ ProviderInboxItem pii=r.get(r.size()-1); ! String pns=pii.getProviderNo(); ! if(pns.equals("000000"))//takes care of case when a provider number is 000000 return true; + else if (pns.equalsIgnoreCase("null")) + return false; else{ ! int pn = Integer.parseInt(pns); if(pn>0){ return true; *************** *** 211,215 **** String sql = ""; try { ! //DBHandler db = new DBHandler(); if ( demographicNo == null) { sql="select d from Document d, ProviderInboxItem p where d.documentNo=p.labNo and p.status like '%"+status+"%' and (p.providerNo like '"+ --- 214,218 ---- String sql = ""; try { ! // if ( demographicNo == null) { sql="select d from Document d, ProviderInboxItem p where d.documentNo=p.labNo and p.status like '%"+status+"%' and (p.providerNo like '"+ *************** *** 221,225 **** logger.debug(sql); - Query query=entityManager.createQuery(sql); List<Document> result=query.getResultList(); --- 224,227 ---- |
|
From: jai <yg...@us...> - 2010-11-06 19:36:17
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22402 Modified Files: Tag: RELEASE_10_06 oscarResources_en.properties Log Message: - ID: 3104263 -text for inbox Index: oscarResources_en.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v retrieving revision 1.327.2.12 retrieving revision 1.327.2.13 diff -C2 -d -r1.327.2.12 -r1.327.2.13 *** oscarResources_en.properties 1 Nov 2010 14:42:16 -0000 1.327.2.12 --- oscarResources_en.properties 6 Nov 2010 19:36:09 -0000 1.327.2.13 *************** *** 1963,1971 **** inboxmanager.document.FlagProviderMsg=Flag Provider: inboxmanager.document.SuccessfullySavedMsg=Successfully saved inboxmanager.document.NextAppointmentMsg=Next Appointment: inboxmanager.document.LinkedProvidersMsg=Linked Providers inboxmanager.documents=Docs inboxmanager.notAssignedDocs=Not Assigned Docs ! dms.documentReport.title=DOCUMENT MANAGEMENT SYSTEM dms.documentReport.msgDelete=Are you sure you want to delete --- 1963,1973 ---- inboxmanager.document.FlagProviderMsg=Flag Provider: inboxmanager.document.SuccessfullySavedMsg=Successfully saved + inboxmanager.document.SaveAndNext=Save & Next inboxmanager.document.NextAppointmentMsg=Next Appointment: inboxmanager.document.LinkedProvidersMsg=Linked Providers inboxmanager.documents=Docs inboxmanager.notAssignedDocs=Not Assigned Docs ! inboxmanager.documentsInQueues=Documents In Queues ! inboxmanager.document.pendingDocs=Pending Docs dms.documentReport.title=DOCUMENT MANAGEMENT SYSTEM dms.documentReport.msgDelete=Are you sure you want to delete |
|
From: jai <yg...@us...> - 2010-11-06 19:35:58
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22330 Modified Files: Tag: RELEASE_10_06 struts-config.xml Log Message: - ID: 3104263 -show docs in queues Index: struts-config.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v retrieving revision 1.334.2.6 retrieving revision 1.334.2.7 diff -C2 -d -r1.334.2.6 -r1.334.2.7 *** struts-config.xml 16 Sep 2010 19:24:49 -0000 1.334.2.6 --- struts-config.xml 6 Nov 2010 19:35:51 -0000 1.334.2.7 *************** *** 608,611 **** --- 608,612 ---- <forward name="doclabPreview" path="/dms/previewDocHL7Inbox.jsp"/> <forward name="dms_index" path="/oscarMDS/Index.jsp" /> + <forward name="document_in_queues" path="/oscarMDS/documentsInQueues.jsp" /> </action> |
|
From: jai <yg...@us...> - 2010-11-06 19:35:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/share/javascript In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22273 Modified Files: Tag: RELEASE_10_06 oscarMDSIndex.js Log Message: - ID: 3104263 -add methods to show docs in queue -dynamic load doc/labs as user scroll down -update side navigation when showing docs in queues -update global data Index: oscarMDSIndex.js =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/share/javascript/oscarMDSIndex.js,v retrieving revision 1.3.2.12 retrieving revision 1.3.2.13 diff -C2 -d -r1.3.2.12 -r1.3.2.13 *** oscarMDSIndex.js 27 Oct 2010 18:24:57 -0000 1.3.2.12 --- oscarMDSIndex.js 6 Nov 2010 19:35:25 -0000 1.3.2.13 *************** *** 21,25 **** --- 21,41 ---- */ + var nowChildId; + var nowDocLabIds=new Array(); + var nowMultiple=1; + + function showDocInQueue(qid){ + $('docs').innerHTML=''; + var docs=queueDocNos[qid]; + nowChildId='docs'; + nowMultiple=1; + nowDocLabIds=new Array(); + for(var i=docs.length-1;i>-1;i--){ + var docid=docs[i]; + nowDocLabIds.push(docid); + } + showFirstTime(); + } function updateLabDemoStatus(labno){ *************** *** 34,38 **** --- 50,59 ---- /************init global data methods*****************/ + function initQueueIdDocs(s){ + var r=new Array(); + s=s.replace('{',''); + s=s.replace('}',''); + } function initPatientIds(s){ *************** *** 135,139 **** return sar; }else{ ! var re=new Arrays(); return re; } --- 156,160 ---- return sar; }else{ ! var re=new Array(); return re; } *************** *** 340,347 **** hideTopBtn(); } } ! function popupStart(vheight,vwidth,varpage) { popupStart(vheight,vwidth,varpage,"helpwindow"); --- 361,394 ---- hideTopBtn(); } + } + function popupMsg(width, height,docid) { + var dn=$('demofind'+docid).value; + var saved=$('saved'+docid).value; + var b=false; + //console.log('saved'+saved); + if(dn==-1 || saved=='false'){ + if(confirm('Document is not linked with a patient, do you still want to Msg?')){ + b=true; + } + }else{ + b=true; + } + if(b){ + var url='../oscarMessenger/SendDemoMessage.do?'+'demographic_no='+dn; + popup(width,height,url,'msg'); + } + } + function popupTickler(width, height,docid) { + var dn=$('demofind'+docid).value; + var saved=$('saved'+docid).value; + if(dn==-1 || saved=='false'){ + alert('Please link document with a patient'); + }else{ + var url="../tickler/ForwardDemographicTickler.do?docType=DOC&demographic_no="+dn+"&docId="+docid; + popup(width,height,url,'Tickler'); } ! } function popupStart(vheight,vwidth,varpage) { popupStart(vheight,vwidth,varpage,"helpwindow"); *************** *** 357,360 **** --- 404,413 ---- windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes"; var popup=window.open(varpage, windowname, windowprops); + if (popup != null) { + if (popup.opener == null) { + popup.opener = self; + } + popup.focus(); + } } *************** *** 429,433 **** } ! function showDocLab(childId,docNo,providerNo,searchProviderNo,status,demoName,showhide){//showhide is 0 = document currently hidden, 1=currently shown //create child element in docViews docNo=docNo.replace(' ','');//trim --- 482,552 ---- } ! ! ! function isNeedShowMore(wh,sd){//input window height and scrool distance , return true if need to scroll down. ! var r=false; ! if(wh*nowMultiple < sd){ ! r=true; ! nowMultiple++; ! } ! return r; ! } ! function showFirstTime(){//show first five doc labs ! ! for(var i=0;i<5;i++){//show 5 ! if(nowDocLabIds.length>0){ ! var id=nowDocLabIds.pop(); ! id=id.replace(" ",""); ! if(id && id.length>0) { ! var ackStatus=getAckStatusFromDocLabId(id); ! var patientId=getPatientIdFromDocLabId(id); ! var patientName=getPatientNameFromPatientId(patientId); ! if(i==0){if(current_first_doclab==0) current_first_doclab=id;} ! showDocLab(nowChildId,id,providerNo,searchProviderNo,ackStatus,patientName); ! } ! } ! } ! } ! function bufferAndShow(){//show 5 if scroll down to a certain extend relative to the window ! var wh=f_clientHeight();//window_height ! var sd=f_scrollTop();//scroll_distance ! var showMore=isNeedShowMore(wh,sd); ! if(showMore){ ! for(var i=0;i<5;i++){//show 5 ! if(nowDocLabIds.length>0){ ! var id=nowDocLabIds.pop(); ! id=id.replace(" ",""); ! if(id && id.length>0) { ! var ackStatus=getAckStatusFromDocLabId(id); ! var patientId=getPatientIdFromDocLabId(id); ! var patientName=getPatientNameFromPatientId(patientId); ! showDocLab(nowChildId,id,providerNo,searchProviderNo,ackStatus,patientName); ! } ! } ! } ! } ! ! } ! function f_clientHeight() { ! return f_filterResults ( ! window.innerHeight ? window.innerHeight : 0, ! document.documentElement ? document.documentElement.clientHeight : 0, ! document.body ? document.body.clientHeight : 0 ! ); ! } ! function f_scrollTop() { ! return f_filterResults ( ! window.pageYOffset ? window.pageYOffset : 0, ! document.documentElement ? document.documentElement.scrollTop : 0, ! document.body ? document.body.scrollTop : 0 ! ); ! } ! function f_filterResults(n_win, n_docel, n_body) { ! var n_result = n_win ? n_win : 0; ! if (n_docel && (!n_result || (n_result > n_docel))) ! n_result = n_docel; ! return n_body && (!n_result || (n_result > n_body)) ? n_body : n_result; ! } ! function showDocLab(childId,docNo,providerNo,searchProviderNo,status,demoName,inQueue){//showhide is 0 = document currently hidden, 1=currently shown //create child element in docViews docNo=docNo.replace(' ','');//trim *************** *** 453,457 **** //oscarLog('url='+url); var data="segmentID="+docNo+"&providerNo="+providerNo+"&searchProviderNo="+searchProviderNo+"&status="+status+"&demoName="+demoName; ! //oscarLog('url='+url+'+-+ \n data='+data); new Ajax.Updater(div,url,{method:'get',parameters:data,insertion:Insertion.Bottom,evalScripts:true,onSuccess:function(transport){ focusFirstDocLab(); --- 572,580 ---- //oscarLog('url='+url); var data="segmentID="+docNo+"&providerNo="+providerNo+"&searchProviderNo="+searchProviderNo+"&status="+status+"&demoName="+demoName; ! if(inQueue) ! data+="&inQueue=true"; ! else ! data+="&inQueue=false"; ! // oscarLog('url='+url+'+-+ \n data='+data+"----div:"+div); new Ajax.Updater(div,url,{method:'get',parameters:data,insertion:Insertion.Bottom,evalScripts:true,onSuccess:function(transport){ focusFirstDocLab(); *************** *** 1011,1022 **** clearDocView(); createNewElement('docViews',childId); ! for(var i=0;i<ids.length;i++){ var docLabId=ids[i].replace(/\s/g,''); ! var ackStatus=getAckStatusFromDocLabId(docLabId); ! var patientId=getPatientIdFromDocLabId(docLabId); ! var patientName=getPatientNameFromPatientId(patientId); ! if(current_first_doclab==0) current_first_doclab=docLabId; ! showDocLab(childId,docLabId,providerNo,searchProviderNo,ackStatus,patientName,ab_normal+'show'); } } } --- 1134,1150 ---- clearDocView(); createNewElement('docViews',childId); ! nowChildId=childId; ! nowMultiple=1; ! nowDocLabIds=new Array(); ! //console.log("nowDocLabIds"); ! //console.log(ids); ! for(var i=ids.length-1;i>-1;i--){//push in reverse so pop first to last var docLabId=ids[i].replace(/\s/g,''); ! //console.log(docLabId); ! nowDocLabIds.push(docLabId); ! //console.log(nowDocLabIds); } + //console.log(nowDocLabIds); + showFirstTime(); } } *************** *** 1031,1047 **** clearDocView(); createNewElement('docViews',childId); ! for(var i=0;i<labdocsArr.length;i++){ var labdoc=labdocsArr[i]; labdoc=labdoc.replace(' ',''); //oscarLog('check type input='+labdoc); var type=checkType(labdoc); ! var ackStatus=getAckStatusFromDocLabId(labdoc); ! var patientName=getPatientNameFromPatientId(patientId); ! if(current_first_doclab==0) current_first_doclab=labdoc; //oscarLog("type="+type+"--subType="+subType); ! if(type==subType) ! showDocLab(childId,labdoc,providerNo,searchProviderNo,ackStatus,patientName,'subtype'+subType+patientId+'show'); ! else; } //toggleMarker('subtype'+subType+patientId+'show'); //} --- 1159,1178 ---- clearDocView(); createNewElement('docViews',childId); ! nowChildId=childId; ! nowMultiple=1; ! nowDocLabIds=new Array(); ! for(var i=labdocsArr.length-1;i>-1;i--){ var labdoc=labdocsArr[i]; labdoc=labdoc.replace(' ',''); //oscarLog('check type input='+labdoc); var type=checkType(labdoc); ! //oscarLog("type="+type+"--subType="+subType); ! if(type==subType){ ! nowDocLabIds.push(labdoc); ! } ! } + showFirstTime(); //toggleMarker('subtype'+subType+patientId+'show'); //} *************** *** 1051,1054 **** --- 1182,1187 ---- function getPatientNameFromPatientId(patientId){ var pn=patientIdNames[patientId]; + //console.log("in getpatientnamefrompatientid"); + //console.log(patientIdNames); if(pn&&pn!=null){ return pn; *************** *** 1056,1065 **** --- 1189,1201 ---- var url=contextpath+"/dms/ManageDocument.do"; var data='method=getDemoNameAjax&demo_no='+patientId; + //console.log('in getp '+patientId); new Ajax.Request(url,{method:'post',parameters:data,onSuccess:function(transport){ var json=transport.responseText.evalJSON(); + //console.log("onsuccess=="+json); if(json!=null ){ var pn=json.demoName;//get name from id addPatientIdName(patientId,pn); addPatientId(patientId); + //console.log("PN ="+pn); return pn; } *************** *** 1073,1088 **** function showAllDocLabs(){ clearDocView(); for(var i=0;i<patientIds.length;i++){ var id=patientIds[i]; //oscarLog("ids in showalldoclabs="+id); if(id.length>0){ ! showThisPatientDocs(id,true); ! } } - } ! function showCategory(cat){ if(cat.length>0){ var sA=getDocLabFromCat(cat); --- 1209,1237 ---- function showAllDocLabs(){ + + clearDocView(); + var childId='showTotalDocLabs'; + createNewElement('docViews',childId); + nowChildId=childId; + nowMultiple=1; + nowDocLabIds=new Array(); for(var i=0;i<patientIds.length;i++){ var id=patientIds[i]; //oscarLog("ids in showalldoclabs="+id); if(id.length>0){ ! //oscarLog("patientId in show this patientdocs="+patientId); ! var labDocsArr=getLabDocFromPatientId(id); ! if(labDocsArr!=null && labDocsArr.length>0){ ! for(var j=labDocsArr.length-1;j>-1;j--){ ! var docId=labDocsArr[j].replace(' ', ''); ! nowDocLabIds.push(docId); } } } ! } ! showFirstTime(); ! } ! function showCategory(cat){//show in document or hl7 if(cat.length>0){ var sA=getDocLabFromCat(cat); *************** *** 1094,1117 **** clearDocView(); createNewElement('docViews',childId); ! for(var i=0;i<sA.length;i++){ var docLabId=sA[i]; docLabId=docLabId.replace(/\s/g, ""); ! //oscarLog("docLabId="+docLabId); ! var patientId=getPatientIdFromDocLabId(docLabId); ! //oscarLog("patientId="+patientId); ! var patientName=getPatientNameFromPatientId(patientId); ! var ackStatus=getAckStatusFromDocLabId(docLabId); ! //oscarLog("patientName="+patientName); ! //oscarLog("ackStatus="+ackStatus); ! ! if(patientName!=null) { ! if(current_first_doclab==0) current_first_doclab=docLabId; ! showDocLab(childId,docLabId,providerNo,searchProviderNo,ackStatus,patientName,cat+'show'); } } - } } - } function getPatientIdFromDocLabId(docLabId){ --- 1243,1258 ---- clearDocView(); createNewElement('docViews',childId); ! nowChildId=childId; ! nowMultiple=1; ! nowDocLabIds=new Array(); ! for(var i=sA.length-1;i>-1;i--){ var docLabId=sA[i]; docLabId=docLabId.replace(/\s/g, ""); ! nowDocLabIds.push(docLabId); } + showFirstTime(); } } } function getPatientIdFromDocLabId(docLabId){ *************** *** 1137,1141 **** //console.log(notUsedPid); for(var i=0;i<notUsedPid.length;i++){ - removePatientId(notUsedPid[i]); } --- 1278,1281 ---- *************** *** 1146,1151 **** return patientDocs[patientId]; } ! ! function showThisPatientDocs(patientId,keepPrevious){ //oscarLog("patientId in show this patientdocs="+patientId); var labDocsArr=getLabDocFromPatientId(patientId); --- 1286,1290 ---- return patientDocs[patientId]; } ! function showThisPatientDocs(patientId,keepPrevious){//show doclabs belong to this patient //oscarLog("patientId in show this patientdocs="+patientId); var labDocsArr=getLabDocFromPatientId(patientId); *************** *** 1156,1169 **** //if(toggleElement(childId)); //else{ ! if(keepPrevious); ! else clearDocView(); createNewElement('docViews',childId); ! for(var i=0;i<labDocsArr.length;i++){ var docId=labDocsArr[i].replace(' ', ''); ! if(current_first_doclab==0) current_first_doclab=docId; ! var ackStatus=getAckStatusFromDocLabId(docId); ! //oscarLog('childId='+childId+',docId='+docId+',ackStatus='+ackStatus); ! showDocLab(childId,docId,providerNo,searchProviderNo,ackStatus,patientName,'labdoc'+patientId+'show'); } } } --- 1295,1309 ---- //if(toggleElement(childId)); //else{ ! //if(keepPrevious); ! clearDocView(); createNewElement('docViews',childId); ! nowChildId=childId; ! nowMultiple=1; ! nowDocLabIds=new Array(); ! for(var i=labDocsArr.length-1;i>-1;i--){ var docId=labDocsArr[i].replace(' ', ''); ! nowDocLabIds.push(docId); } + showFirstTime(); } } *************** *** 1205,1209 **** } ! function updateDocLabData(doclabid){//remove doclabid from global variables //console.log('in updatedoclabdata='+doclabid); if(doclabid){ --- 1345,1349 ---- } ! function updateDocLabData(doclabid,inQueue){//remove doclabid from global variables //console.log('in updatedoclabdata='+doclabid); if(doclabid){ *************** *** 1211,1217 **** //trim doclabid doclabid=doclabid.replace(/\s/g,''); ! updateSideNav(doclabid); //console.log('aa_aa11'); ! hideRowUsingId(doclabid); //console.log('aa_aa'); //change typeDocLab --- 1351,1358 ---- //trim doclabid doclabid=doclabid.replace(/\s/g,''); ! updateSideNav(doclabid,inQueue); //console.log('aa_aa11'); ! if(inQueue){;} ! else hideRowUsingId(doclabid); //console.log('aa_aa'); //change typeDocLab *************** *** 1254,1258 **** return 'abnormal'; } ! function updateSideNav(doclabid){ //oscarLog('in updatesidenav'); var n=$('totalNumDocs').innerHTML; --- 1395,1461 ---- return 'abnormal'; } ! function removeDocFromQueue(docid){ ! //console.log('before removal '); ! //console.log(queueDocNos); ! var found=false; ! for(i in queueDocNos){ ! var r=queueDocNos[i]; ! //console.log('when r is '); ! //console.log(r); ! for(var j=0;j<r.length;j++){ ! if(r[j]==docid){ ! //remove it ! r.splice(j,1); ! //console.log('after splice, j is'+j); ! //console.log(r); ! queueDocNos[i]=r; ! found=true; ! break; ! }else{ ! ! } ! } ! if(found) ! break;//break the outer for loop. ! } ! //console.log('after removal '); ! //console.log(queueDocNos); ! } ! ! function updateSideNavInQueue(docid){ ! //console.log('in updateSide'); ! var foundQ=''; ! //find which queueid the doc is in ! for(var i in queueDocNos){ ! var r=queueDocNos[i]; ! for(var j=0;j<r.length;j++){ ! if(r[j]==docid){ ! foundQ=i; ! //console.log('match found foundQ='+foundQ); ! break; ! } ! } ! if(foundQ==i) ! break; ! } ! //console.log('foundQ='+foundQ); ! //descrease the queue's doc number by 1 ! if(foundQ.length>0){ ! var n=$('docNo_'+foundQ).innerHTML; ! //console.log('not found11'); ! n=parseInt(n); ! //console.log('not found22'); ! if(n>0){ ! //console.log('not found33'); ! $('docNo_'+foundQ).innerHTML=n-1; ! } ! } ! //console.log('not found44'); ! ! } ! function updateSideNav(doclabid, inqueue){ ! if(inqueue) ! updateSideNavInQueue(doclabid); ! else{ //oscarLog('in updatesidenav'); var n=$('totalNumDocs').innerHTML; *************** *** 1324,1330 **** } } ! function getRowIdFromDocLabId(doclabid){ var rowid; for(var i=0;i<doclabid_seq.length;i++){ if(doclabid==doclabid_seq[i]){ --- 1527,1538 ---- } } ! } function getRowIdFromDocLabId(doclabid){ var rowid; + //console.log('getRowIdFromDocLabId '+doclabid); + if(doclabid_sql){ + //console.log("doclabid_sql"); + //console.log(doclabid_sql); + for(var i=0;i<doclabid_seq.length;i++){ if(doclabid==doclabid_seq[i]){ *************** *** 1333,1336 **** --- 1541,1546 ---- } } + + } return rowid; } *************** *** 1341,1345 **** doclabid=doclabid.replace(' ',''); rowid=getRowIdFromDocLabId(doclabid); ! $(rowid).remove(); } } --- 1551,1555 ---- doclabid=doclabid.replace(' ',''); rowid=getRowIdFromDocLabId(doclabid); ! if($(rowid)) $(rowid).remove(); } } *************** *** 1362,1366 **** /***methos for showDocument.jsp***/ ! function updateGlobalDataAndSideNav(doclabid,patientId){ doclabid=doclabid.replace(/\s/g,''); if(doclabid.length>0){ --- 1572,1576 ---- /***methos for showDocument.jsp***/ ! function addDocToPatient(doclabid,patientId){//if doc is previously not assigned to a patient, add it to a patient's list of docs doclabid=doclabid.replace(/\s/g,''); if(doclabid.length>0){ *************** *** 1433,1436 **** --- 1643,1647 ---- var url=contextpath+"/dms/ManageDocument.do"; var data='method=getDemoNameAjax&demo_no='+patientId; + //console.log('in cre '+patientId); new Ajax.Request(url,{method:'post',parameters:data,onSuccess:function(transport){ var json=transport.responseText.evalJSON(); *************** *** 1497,1512 **** } } ! function popupStart(vheight,vwidth,varpage,windowname) { ! //oscarLog("in popupStart "); ! if(!windowname) ! windowname="helpwindow"; ! var page = varpage; ! var windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes"; ! //oscarLog(varpage); ! //oscarLog(windowname); ! //oscarLog(windowprops); ! var popup=window.open(varpage, windowname, windowprops); } ! function updateDocument(eleId){//save doc info var url="../dms/ManageDocument.do",data=$(eleId).serialize(true); new Ajax.Request(url,{method:'post',parameters:data,onSuccess:function(transport){ --- 1708,1725 ---- } } ! ! function saveNext(docid){ ! updateDocument('forms_'+docid,true); ! } ! function updateDocStatusInQueue(docid){//change status of queue document link row to I=inactive ! //console.log('in updateDocStatusInQueue, docid '+docid); ! var url="../dms/inboxManage.do",data="docid="+docid+"&method=updateDocStatusInQueue"; ! new Ajax.Request(url,{method:'post',parameters:data,onSuccess:function(transport){}}); ! ! ! } ! ! function updateDocument(eleId,isNext){//save doc info var url="../dms/ManageDocument.do",data=$(eleId).serialize(true); new Ajax.Request(url,{method:'post',parameters:data,onSuccess:function(transport){ *************** *** 1522,1542 **** $("saveSucessMsg_"+num).show(); $('saved'+num).value='true'; ! ! var success= updateGlobalDataAndSideNav(num,patientId); if(success){ success=updatePatientDocLabNav(num,patientId); if(success){ //disable demo input $('autocompletedemo'+num).disabled=true; //console.log('updated by save'); //console.log(patientDocs); } } } }}); return false; } ! function updateStatus(formid){//acknowledge var num=formid.split("_"); var doclabid=num[1]; --- 1735,1775 ---- $("saveSucessMsg_"+num).show(); $('saved'+num).value='true'; ! //console.log('before update global data'); ! var success= addDocToPatient(num,patientId); ! //console.log('result of update global data='+success); if(success){ success=updatePatientDocLabNav(num,patientId); + //console.log('result of update patient doc lab nav '+success); if(success){ + //console.log('before disable autocompletedemo '+num+'--'+$('autocompletedemo'+num)); //disable demo input + if($('autocompletedemo'+num)) $('autocompletedemo'+num).disabled=true; //console.log('updated by save'); //console.log(patientDocs); + //console.log("isNext "+isNext); + if(isNext){ + //console.log("isNext is true"); + //blind up + Effect.BlindUp('labdoc_'+num); + //make the document out of the queue + updateDocStatusInQueue(num); + //update side navigation for queue + updateSideNav(num,true); + //remove doc from queueDocNos + removeDocFromQueue(num); } } } + } }}); return false; } ! function updateStatus(formid,inQueue){//acknowledge ! if(inQueue) ! //console.log('inqueue is boolean true'); ! if(inQueue=='true') ! //console.log('inqueue is string true'); var num=formid.split("_"); var doclabid=num[1]; *************** *** 1551,1560 **** new Ajax.Request(url,{method:'post',parameters:data,onSuccess:function(transport){ ! if(doclabid){ Effect.BlindUp('labdoc_'+doclabid); ! updateDocLabData(doclabid); ! } }}); } --- 1784,1801 ---- new Ajax.Request(url,{method:'post',parameters:data,onSuccess:function(transport){ ! //console.log('after updatestatus ,doclabid '+doclabid); if(doclabid){ Effect.BlindUp('labdoc_'+doclabid); ! updateDocLabData(doclabid,inQueue); ! if(inQueue){ ! //console.log(' inqueue is true '); ! //make the document out of the queue ! updateDocStatusInQueue(doclabid); ! //remove doc from queueDocNos ! removeDocFromQueue(doclabid); ! }else{ ! //console.log('inqueue is false'); } + } }}); } |
|
From: jai <yg...@us...> - 2010-11-06 19:35:23
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22217 Modified Files: Tag: RELEASE_10_06 showDocument.jsp Log Message: - ID: 3104263 -add save and next button -change tickler and msg button -other small changes Index: showDocument.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms/showDocument.jsp,v retrieving revision 1.5.2.8 retrieving revision 1.5.2.9 diff -C2 -d -r1.5.2.8 -r1.5.2.9 *** showDocument.jsp 28 Sep 2010 18:51:33 -0000 1.5.2.8 --- showDocument.jsp 6 Nov 2010 19:35:15 -0000 1.5.2.9 *************** *** 15,18 **** --- 15,22 ---- String searchProviderNo = request.getParameter("searchProviderNo"); String status = request.getParameter("status"); + String inQueue=request.getParameter("inQueue"); + boolean inQueueB=false; + if(inQueue!=null && inQueue.equals("true")) + inQueueB=true; String creator = (String) session.getAttribute("user"); *************** *** 86,89 **** --- 90,94 ---- //enable Save button whenever a selection is made $('save<%=docId%>').enable(); + $('saveNext<%=docId%>').enable(); }); *************** *** 236,240 **** <tr> <td><bean:message key="inboxmanager.document.DemographicMsg" /></td> ! <td><%if(!demographicID.equals("-1")){%> <input id="saved<%=docId%>" type="hidden" name="saved" value="true"/> <input type="hidden" value="<%=demographicID%>" name="demog" id="demofind<%=docId%>" /> --- 241,246 ---- <tr> <td><bean:message key="inboxmanager.document.DemographicMsg" /></td> ! <td><% ! if(!demographicID.equals("-1")){%> <input id="saved<%=docId%>" type="hidden" name="saved" value="true"/> <input type="hidden" value="<%=demographicID%>" name="demog" id="demofind<%=docId%>" /> *************** *** 248,252 **** <input id="saved_<%=docId%>" type="hidden" name="saved" value="false"/> ! <input id="mrp_<%=docId%>" type="checkbox" onclick="sendMRP(this)" name="demoLink" ><bean:message key="inboxmanager.document.SendToMRPMsg" /> <a id="mrp_fail_<%=docId%>" style="color:red;font-style: italic;display: none;" ><bean:message key="inboxmanager.document.SendToMRPFailedMsg" /></a> </td> --- 254,258 ---- <input id="saved_<%=docId%>" type="hidden" name="saved" value="false"/> ! <br><input id="mrp_<%=docId%>" type="checkbox" onclick="sendMRP(this)" name="demoLink" ><bean:message key="inboxmanager.document.SendToMRPMsg" /> <a id="mrp_fail_<%=docId%>" style="color:red;font-style: italic;display: none;" ><bean:message key="inboxmanager.document.SendToMRPFailedMsg" /></a> </td> *************** *** 273,277 **** <tr> ! <td colspan="2" align="right"><a id="saveSucessMsg_<%=docId%>" style="display:none;color:blue;"><bean:message key="inboxmanager.document.SuccessfullySavedMsg"/></a><%if(!demographicID.equals("-1")){%><input type="submit" name="save" id="save<%=docId%>" value="Save" /><%} else{%><input type="submit" name="save" id="save<%=docId%>" disabled value="Save" /> <%}%> </tr> --- 279,285 ---- <tr> ! <td width="30%" colspan="1" align="right"><a id="saveSucessMsg_<%=docId%>" style="display:none;color:blue;"><bean:message key="inboxmanager.document.SuccessfullySavedMsg"/></a></td> ! <td width="30%" colspan="1" align="right"><%if(!demographicID.equals("-1")){%><input type="submit" name="save" id="save<%=docId%>" value="Save" /><input type="button" name="save" id="saveNext<%=docId%>" onclick="saveNext(<%=docId%>)" value='<bean:message key="inboxmanager.document.SaveAndNext"/>' /><%} ! else{%><input type="submit" name="save" id="save<%=docId%>" disabled value="Save" /><input type="button" name="save" onclick="saveNext(<%=docId%>)" id="saveNext<%=docId%>" disabled value='<bean:message key="inboxmanager.document.SaveAndNext"/>' /> <%}%> </tr> *************** *** 287,291 **** <%for (ProviderInboxItem pItem : routeList) { String s=p.getProperty(pItem.getProviderNo(), pItem.getProviderNo()); ! if(!s.equals("0")){ %> <li><%=s%></li> <%} --- 295,300 ---- <%for (ProviderInboxItem pItem : routeList) { String s=p.getProperty(pItem.getProviderNo(), pItem.getProviderNo()); ! ! if(!s.equals("0")&&!s.equals("null")){ %> <li><%=s%></li> <%} *************** *** 357,361 **** <input type="hidden" name="ajax" value="yes" /> </form> ! <form name="acknowledgeForm_<%=docId%>" id="acknowledgeForm_<%=docId%>" onsubmit="updateStatus('acknowledgeForm_<%=docId%>');" method="post" action="javascript:void(0);"> <table width="100%" height="100%" border="0" cellspacing="0" cellpadding="0"> --- 366,370 ---- <input type="hidden" name="ajax" value="yes" /> </form> ! <form name="acknowledgeForm_<%=docId%>" id="acknowledgeForm_<%=docId%>" onsubmit="updateStatus('acknowledgeForm_<%=docId%>',<%=inQueueB%>);" method="post" action="javascript:void(0);"> <table width="100%" height="100%" border="0" cellspacing="0" cellpadding="0"> *************** *** 382,387 **** <input type="button" id="printBtn_<%=docId%>" value=" <bean:message key="global.btnPrint"/> " onClick="popup(700,960,'<%=url2%>','file download')"> <% if (demographicID != null && !demographicID.equals("") && !demographicID.equalsIgnoreCase("null")) {%> ! <input type="button" id="msgBtn_<%=docId%>" value="Msg" onclick="popup(700,960,'../oscarMessenger/SendDemoMessage.do?demographic_no=<%=demographicID%>','msg')"/> ! <input type="button" id="ticklerBtn_<%=docId%>" value="Tickler" onclick="popup(450,600,'../tickler/ForwardDemographicTickler.do?docType=DOC&docId=<%=docId%>&demographic_no=<%=demographicID%>','tickler')"/> <% } --- 391,396 ---- <input type="button" id="printBtn_<%=docId%>" value=" <bean:message key="global.btnPrint"/> " onClick="popup(700,960,'<%=url2%>','file download')"> <% if (demographicID != null && !demographicID.equals("") && !demographicID.equalsIgnoreCase("null")) {%> ! <input type="button" id="msgBtn_<%=docId%>" value="Msg" onclick="popupMsg(700,960,'<%=docId%>');"/> ! <input type="button" id="ticklerBtn_<%=docId%>" value="Tickler" onclick="popupTickler(450,600,'<%=docId%>')"/> <% } |
|
From: jai <yg...@us...> - 2010-11-06 19:35:19
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21987 Modified Files: Tag: RELEASE_10_06 Index.jsp Log Message: - ID: 3104263 -add scroll observe event Index: Index.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS/Index.jsp,v retrieving revision 1.41.2.12 retrieving revision 1.41.2.13 diff -C2 -d -r1.41.2.12 -r1.41.2.13 *** Index.jsp 27 Oct 2010 18:24:41 -0000 1.41.2.12 --- Index.jsp 6 Nov 2010 19:35:11 -0000 1.41.2.13 *************** *** 117,120 **** --- 117,124 ---- </style> <script type="text/javascript" > + Event.observe(window,'scroll',function(){//check for scrolling + bufferAndShow(); + }); + var tabindex=0; var current_first_doclab=0; *************** *** 232,236 **** | <a href="javascript:popupStart(600,500,'../dms/html5AddDocuments.jsp')" style="color: #FFFFFF; "><bean:message key="inboxmanager.document.uploadDoc"/></a> | <a href="javascript:void(0);" onclick="changeView();" style="color: #FFFFFF;"><bean:message key="inboxmanager.document.changeView"/></a> ! </td> </tr> --- 236,240 ---- | <a href="javascript:popupStart(600,500,'../dms/html5AddDocuments.jsp')" style="color: #FFFFFF; "><bean:message key="inboxmanager.document.uploadDoc"/></a> | <a href="javascript:void(0);" onclick="changeView();" style="color: #FFFFFF;"><bean:message key="inboxmanager.document.changeView"/></a> ! | <a href="javascript:popupStart(700,1100,'../dms/inboxManage.do?method=getDocumentsInQueues')" style="color: #FFFFFF;"><bean:message key="inboxmanager.document.pendingDocs"/></a> </td> </tr> |
|
From: jai <yg...@us...> - 2010-11-06 19:34:02
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21443 Added Files: Tag: RELEASE_10_06 documentsInQueues.jsp Log Message: - ID: 3104263 -show docs in queues --- NEW FILE: documentsInQueues.jsp --- <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ page import="java.util.*, oscar.util.*, oscar.OscarProperties, oscar.dms.*, oscar.dms.data.*"%> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Documents In Queues</title> <script type="text/javascript" src="<%= request.getContextPath() %>/share/javascript/oscarMDSIndex.js"></script> <script type="text/javascript" src="<%= request.getContextPath() %>/share/javascript/prototype.js"></script> <!-- main calendar program --> <script type="text/javascript" src="../share/calendar/calendar.js"></script> <!-- language for the calendar --> <script type="text/javascript" src="../share/calendar/lang/<bean:message key='global.javascript.calendar'/>"></script> <!-- the following script defines the Calendar.setup helper function, which makes adding a calendar a matter of 1 or 2 lines of code. --> <script type="text/javascript" src="../share/calendar/calendar-setup.js"></script> <!-- calendar style sheet --> <link rel="stylesheet" type="text/css" media="all" href="../share/calendar/calendar.css" title="win2k-cold-1" /> <link rel="stylesheet" type="text/css" href="../share/css/OscarStandardLayout.css"> <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script> <script type="text/javascript" src="<%= request.getContextPath() %>/share/javascript/prototype.js"></script> <script type="text/javascript" src="<%= request.getContextPath() %>/share/javascript/effects.js"></script> <script type="text/javascript" src="<%= request.getContextPath() %>/share/javascript/Oscar.js"></script> <script type="text/javascript" src="../share/javascript/controls.js"></script> <script type="text/javascript" src="../share/yui/js/yahoo-dom-event.js"></script> <script type="text/javascript" src="../share/yui/js/connection-min.js"></script> <script type="text/javascript" src="../share/yui/js/animation-min.js"></script> <script type="text/javascript" src="../share/yui/js/datasource-min.js"></script> <script type="text/javascript" src="../share/yui/js/autocomplete-min.js"></script> <script type="text/javascript" src="../js/demographicProviderAutocomplete.js"></script> <link rel="stylesheet" type="text/css" href="../share/yui/css/fonts-min.css"/> <link rel="stylesheet" type="text/css" href="../share/yui/css/autocomplete.css"/> <link rel="stylesheet" type="text/css" media="all" href="../share/css/demographicProviderAutocomplete.css" /> <link rel="stylesheet" type="text/css" media="all" href="../share/css/oscarMDSIndex.css" /> <style type="text/css"> .Cell{ background-color:#9999CC; border-color:#CCCCFF #6666CC #6666CC #CCCCFF; border-left:thin solid #CCCCFF; border-right:thin solid #6666CC; border-style:solid; border-width:thin; height:0px; } </style> </head> <body> <% Hashtable queueIdNames=(Hashtable)request.getAttribute("queueIdNames");//each queue id has a corresponding name Hashtable queueDocNos=(Hashtable)request.getAttribute("queueDocNos");//one queue id is linked to a list of docs String providerNo=(String)request.getAttribute("providerNo"); String searchProviderNo=(String)request.getAttribute("searchProviderNo"); Enumeration keys=queueDocNos.keys(); String patientIdNamesStr=(String)request.getAttribute("patientIdNamesStr"); Hashtable docStatus=(Hashtable)request.getAttribute("docStatus"); String patientIdStr =(String)request.getAttribute("patientIdStr"); Hashtable typeDocLab =(Hashtable)request.getAttribute("typeDocLab"); Hashtable docType=(Hashtable)request.getAttribute("docType"); Hashtable patientDocs=(Hashtable)request.getAttribute("patientDocs"); List<String> normals=(List<String>)request.getAttribute("normals"); List<String> abnormals=(List<String>)request.getAttribute("abnormals"); %> <table id="pendingDocs" width="100%"> <tr oldclass="MainTableTopRow"> <td class="MainTableTopRowRightColumn" colspan="2" align="left"> <table width="100%"> <tr > <td align="center" colspan="2" class="Nav" valign="center"><span class="white"><bean:message key="inboxmanager.documentsInQueues"/></span></td> </tr> <tr> <td align="left" valign="center" > <input type="hidden" name="providerNo" value="<%= providerNo %>"> <input type="hidden" name="searchProviderNo" value="<%= searchProviderNo %>"> <%= (request.getParameter("lname") == null ? "" : "<input type=\"hidden\" name=\"lname\" value=\""+request.getParameter("lname")+"\">") %> <%= (request.getParameter("fname") == null ? "" : "<input type=\"hidden\" name=\"fname\" value=\""+request.getParameter("fname")+"\">") %> <%= (request.getParameter("hnum") == null ? "" : "<input type=\"hidden\" name=\"hnum\" value=\""+request.getParameter("hnum")+"\">") %> <input type="hidden" name="selectedProviders"> <input type="button" class="smallButton" onclick="window.close();" value="<bean:message key="oscarMDS.index.btnClose"/>" </td> <td align="right" valign="center" width="30%"> <a href="javascript:popupStart(300,400,'../oscarEncounter/Help.jsp')" style="color: #FFFFFF;"><bean:message key="global.help"/></a> | <a href="javascript:popupStart(300,400,'../oscarEncounter/About.jsp')" style="color: #FFFFFF;" ><bean:message key="global.about"/></a> </td> </tr> </table> </td> </tr> <tr> <th class="Cell" align="left" valign="bottom" nowrap>Queues</th> <th class="Cell" align="left" valign="bottom" nowrap>Documents</th> </tr> <tr > <td valign="top" id="queueNames" width="20%"> <% while(keys.hasMoreElements()){ Integer qId=(Integer)keys.nextElement(); String name=(String)queueIdNames.get(qId); List dos=(List)queueDocNos.get(qId); Integer numberOfDocs=dos.size(); %> <a href="javascript:void(0);" onclick="resetCurrentFirstDocLab();showDocInQueue('<%=qId%>')"><%=name%> (<span id="docNo_<%=qId%>"><%=numberOfDocs%></span>)</a><br/> <%}%> </td> <td valign="top" id="docs" width="80%"></td> </tr> </table> <script type="text/javascript"> var current_first_doclab=0; var typeDocLab=initTypeDocLab('<%=typeDocLab%>'); //{DOC=[357, 317, 316], HL7=[38, 33, 30, 28]} var docType=initDocType('<%=docType%>'); //{357=DOC, 38=HL7, 317=DOC, 316=DOC, 33=HL7, 30=HL7, 28=HL7} var patientDocs=initPatientDocs('<%=patientDocs%>');//{2=[316, 30, 28], 1=[33], -1=[357, 317, 38]} var patientIdNames=initPatientIdNames('<%=patientIdNamesStr%>');//;2=TEST2, PATIENT2;1=Zrrr, Srrr;-1=Not, Assigned var docStatus=initDocStatus('<%=docStatus%>');//{357=A, 38=N, 317=A, 316=A, 33=N, 30=N, 28=N} var normals=initNormals('<%=normals%>');//[357, 317, 316, 38, 33, 30, 28] var abnormals=initAbnormals('<%=abnormals%>');//[123,567] var patientIds=initPatientIds('<%=patientIdStr%>'); var queueDocNos=initHashtableWithList('<%=queueDocNos%>'); var providerNo='<%=providerNo%>'; var searchProviderNo='<%=searchProviderNo%>'; /*console.log(typeDocLab); console.log(docType); console.log(patientDocs); console.log(patientIdNames); console.log(docStatus); console.log(normals); console.log(abnormals); console.log(patientIds); console.log(queueDocNos); console.log(providerNo); console.log(searchProviderNo);*/ var types=['DOC']; var contextpath='<%=request.getContextPath()%>'; Event.observe(window,'scroll',function(){//check for scrolling bufferAndShow(); }); </script> </body> </html> |
|
From: jai <yg...@us...> - 2010-11-06 18:06:30
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv4269 Added Files: update-2010-11-06.sql Log Message: - ID: 3104263 -add status column --- NEW FILE: update-2010-11-06.sql --- alter table queue_document_link add status char(1); |
|
From: jai <yg...@us...> - 2010-11-06 17:37:22
|
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-serv29776 Modified Files: DmsInboxManageAction.java Log Message: - ID: 3104263 -add documents in queues -update status in queue link Index: DmsInboxManageAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/actions/DmsInboxManageAction.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** DmsInboxManageAction.java 22 Oct 2010 21:48:03 -0000 1.11 --- DmsInboxManageAction.java 6 Nov 2010 17:37:14 -0000 1.12 *************** *** 63,66 **** --- 63,67 ---- import org.oscarehr.common.dao.QueueDao; import org.oscarehr.common.model.Demographic; + import org.oscarehr.document.dao.DocumentDAO; import org.oscarehr.util.MiscUtils; import oscar.dms.EDocUtil; *************** *** 80,83 **** --- 81,85 ---- private SecObjectNameDao secObjectNameDao=null; private SecUserRoleDao secUserRoleDao = (SecUserRoleDao) SpringUtils.getBean("secUserRoleDao"); + private QueueDao queueDAO=(QueueDao)SpringUtils.getBean("queueDao"); public void setProviderInboxRoutingDAO(ProviderInboxRoutingDao providerInboxRoutingDAO){ this.providerInboxRoutingDAO = providerInboxRoutingDAO; *************** *** 275,278 **** --- 277,281 ---- + public ActionForward prepareForIndexPage(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { HttpSession session=request.getSession(); *************** *** 477,481 **** patientDocs.put(labPatientId, segIDs); patientIdNames.put(labPatientId, data.patientName); ! patientIdNamesStr+=';'+labPatientId+'='+data.patientName; } docStatus.put(data.getSegmentID(), data.getAcknowledgedStatus()); --- 480,484 ---- patientDocs.put(labPatientId, segIDs); patientIdNames.put(labPatientId, data.patientName); ! patientIdNamesStr+=";"+labPatientId+"="+data.patientName; } docStatus.put(data.getSegmentID(), data.getAcknowledgedStatus()); *************** *** 616,618 **** --- 619,742 ---- } + + public ActionForward updateDocStatusInQueue(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response){ + String docid=request.getParameter("docid"); + if(docid!=null){ + if(!queueDocumentLinkDAO.setStatusInactive(Integer.parseInt(docid))){ + MiscUtils.getLogger().error("failed to set status in queue document link to be inactive"); + } + } + return null; + } + + //return a hastable containing queue id to queue name, a hashtable of queue id and a list of document nos. + //forward to documentInQueus.jsp + public ActionForward getDocumentsInQueues(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response){ + HttpSession session=request.getSession(); + try{if(session.getAttribute("userrole") == null ) response.sendRedirect("../logout.jsp");} + catch(Exception e){MiscUtils.getLogger().error("Error", e);} + String providerNo = (String) session.getAttribute("user"); + String searchProviderNo = request.getParameter("searchProviderNo"); + String ackStatus = request.getParameter("status"); + + + if ( ackStatus == null ) { ackStatus = "N"; } // default to new labs only + if ( providerNo == null ) { providerNo = ""; } + if ( searchProviderNo == null ) { searchProviderNo = providerNo; } + + String patientIdNamesStr=""; + List<QueueDocumentLink> qs=queueDocumentLinkDAO.getActiveQueueDocLink(); + Hashtable queueDocNos=new Hashtable(); + Hashtable docType=new Hashtable(); + Hashtable<Integer,List> patientDocs=new Hashtable(); + DocumentDAO documentDAO=(DocumentDAO) SpringUtils.getBean("documentDAO"); + Demographic demo =new Demographic(); + List docsWithPatient=new ArrayList(); + Hashtable patientIdNames=new Hashtable();//lbData.patientName = demo.getLastName()+ ", "+demo.getFirstName(); + List<Integer> patientIds=new ArrayList(); + Integer demoNo; + Hashtable docStatus=new Hashtable(); + String patientIdStr=""; + StringBuffer patientIdBuf=new StringBuffer(); + Hashtable typeDocLab=new Hashtable(); + List ListDocIds=new ArrayList(); + for(QueueDocumentLink q:qs){ + int qid=q.getQueueId(); + int docid=q.getDocId(); + ListDocIds.add(docid); + docType.put(docid,"DOC"); + demo=documentDAO.getDemoFromDocNo(Integer.toString(docid)); + if(demo==null) + demoNo=-1; + else + demoNo=demo.getDemographicNo(); + if(!patientIds.contains(demoNo)) + patientIds.add(demoNo); + if(!patientIdNames.containsKey(demoNo)){ + if(demoNo==-1){ + patientIdNames.put(demoNo,"Not, Assigned"); + patientIdNamesStr+=";"+demoNo+"="+"Not, Assigned"; + } + else{ + patientIdNames.put(demoNo, demo.getLastName()+", "+demo.getFirstName()); + patientIdNamesStr+=";"+demoNo+"="+demo.getLastName()+", "+demo.getFirstName(); + } + + + } + List providers=providerInboxRoutingDAO.getProvidersWithRoutingForDocument("DOC",Integer.toString(docid) ); + if(providers.size()>0){ + ProviderInboxItem pii=(ProviderInboxItem)providers.get(0); + docStatus.put(docid, pii.getStatus()); + } + if(patientDocs.containsKey(demoNo)){ + docsWithPatient=patientDocs.get(demoNo); + docsWithPatient.add(docid); + patientDocs.put(demoNo,docsWithPatient); + }else{ + docsWithPatient=new ArrayList(); + docsWithPatient.add(docid); + patientDocs.put(demoNo, docsWithPatient); + } + if(queueDocNos.containsKey(qid)){ + + List<Integer> ds= (List<Integer>)queueDocNos.get(qid); + ds.add(docid); + queueDocNos.put(qid, ds); + + }else{ + List<Integer> ds=new ArrayList(); + ds.add(docid); + queueDocNos.put(qid, ds); + } + } + Integer dn=0; + for(int i=0;i<patientIds.size();i++){ + dn=patientIds.get(i); + patientIdBuf.append(dn); + if(i!=patientIds.size()-1) + patientIdBuf.append(","); + } + patientIdStr=patientIdBuf.toString(); + typeDocLab.put("DOC", ListDocIds); + List normals=ListDocIds;//assume all documents are normal + List abnormals=new ArrayList(); + request.setAttribute("typeDocLab", typeDocLab); + request.setAttribute("docStatus", docStatus); + request.setAttribute("patientDocs",patientDocs ); + request.setAttribute("patientIdNames",patientIdNames ); + request.setAttribute("docType", docType); + request.setAttribute("patientIds", patientIds); + request.setAttribute("patientIdStr",patientIdStr ); + request.setAttribute("normals", normals); + request.setAttribute("abnormals", abnormals); + request.setAttribute("queueDocNos", queueDocNos); + request.setAttribute("patientIdNamesStr",patientIdNamesStr); + request.setAttribute("queueIdNames", queueDAO.getQueuesHashtable()); + request.setAttribute("providerNo", providerNo); + request.setAttribute("searchProviderNo", searchProviderNo); + return mapping.findForward("document_in_queues"); + + + } } |
|
From: jai <yg...@us...> - 2010-11-06 17:37:07
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29715 Modified Files: QueueDocumentLink.java Log Message: - ID: 3104263 -add method for new column Index: QueueDocumentLink.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/QueueDocumentLink.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** QueueDocumentLink.java 4 Jun 2010 19:17:04 -0000 1.1 --- QueueDocumentLink.java 6 Nov 2010 17:36:59 -0000 1.2 *************** *** 35,38 **** --- 35,39 ---- private int docId; private int queueId; + private String status; public int getId() { *************** *** 56,58 **** --- 57,65 ---- this.queueId=qId; } + public void setStatus(String s){ + this.status=s; + } + public String getStatus(){ + return this.status; + } } |
|
From: jai <yg...@us...> - 2010-11-06 17:36:54
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29671 Modified Files: QueueDocumentLink.hbm.xml Log Message: - ID: 3104263 -add new column Index: QueueDocumentLink.hbm.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/QueueDocumentLink.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** QueueDocumentLink.hbm.xml 4 Jun 2010 19:16:50 -0000 1.1 --- QueueDocumentLink.hbm.xml 6 Nov 2010 17:36:46 -0000 1.2 *************** *** 27,30 **** --- 27,31 ---- <property name="queueId" column="queue_id"/> <property name="docId" column="document_id"/> + <property name="status" column="status"/> </class> </hibernate-mapping> |
|
From: jai <yg...@us...> - 2010-11-06 17:36:39
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29620 Modified Files: QueueDocumentLinkDao.java Log Message: - ID: 3104263 -set status to inactive -get active queue and document link Index: QueueDocumentLinkDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/QueueDocumentLinkDao.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** QueueDocumentLinkDao.java 12 Jul 2010 20:04:08 -0000 1.4 --- QueueDocumentLinkDao.java 6 Nov 2010 17:36:31 -0000 1.5 *************** *** 27,30 **** --- 27,31 ---- import java.util.List; + import org.oscarehr.common.model.Queue; import org.oscarehr.common.model.QueueDocumentLink; *************** *** 43,46 **** --- 44,51 ---- return queues; } + public List getActiveQueueDocLink(){ + return this.getHibernateTemplate().find("from QueueDocumentLink where status=?",new Object[]{"A"}); + } + public List getQueueFromDocument(Integer docId){ List queues = this.getHibernateTemplate().find("from QueueDocumentLink where docId = ?",new Object[] {docId}); *************** *** 61,65 **** return false; } ! public void addToQueueDocumentLink(Integer qId,Integer dId){ try{ --- 66,84 ---- return false; } ! public boolean setStatusInactive(Integer docId){ ! List<QueueDocumentLink> qs=getQueueFromDocument(docId); ! if(qs.size()>0){ ! QueueDocumentLink q=qs.get(0); ! if(!q.getStatus().equals("I")){ ! q.setStatus("I"); ! this.getHibernateTemplate().update(q); ! return true; ! }else{ ! return false; ! } ! }return false; ! //if status is not I, change to I ! //if status is I, do nothing ! } public void addToQueueDocumentLink(Integer qId,Integer dId){ try{ |
|
From: jai <yg...@us...> - 2010-11-06 17:36:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29593 Modified Files: QueueDao.java Log Message: - ID: 3104263 -add getQueuesHashtable(); Index: QueueDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/QueueDao.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** QueueDao.java 25 Jul 2010 03:23:51 -0000 1.3 --- QueueDao.java 6 Nov 2010 17:36:11 -0000 1.4 *************** *** 24,27 **** --- 24,38 ---- } + public Hashtable getQueuesHashtable(){ + String q="select q from Queue q"; + Query query=entityManager.createQuery(q); + List<Queue> result=new ArrayList(); + result=query.getResultList(); + Hashtable ht=new Hashtable(); + for(Queue que:result){ + ht.put(que.getId(),que.getName()); + } + return ht; + } public List<Hashtable> getQueues(){ String q="select q from Queue q"; |
|
From: jai <yg...@us...> - 2010-11-06 17:36:06
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29531 Modified Files: DocumentResultsDao.java Log Message: - ID: 3104263 -prevent null pointer exception Index: DocumentResultsDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/DocumentResultsDao.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DocumentResultsDao.java 25 Oct 2010 14:08:14 -0000 1.7 --- DocumentResultsDao.java 6 Nov 2010 17:35:58 -0000 1.8 *************** *** 47,54 **** if(r!=null && r.size()>0){ ProviderInboxItem pii=r.get(r.size()-1); ! if(pii.getProviderNo().equals("000000"))//takes care of case when a provider number is 000000 return true; else{ ! int pn = Integer.parseInt(pii.getProviderNo()); if(pn>0){ return true; --- 47,57 ---- if(r!=null && r.size()>0){ ProviderInboxItem pii=r.get(r.size()-1); ! String pns=pii.getProviderNo(); ! if(pns.equals("000000"))//takes care of case when a provider number is 000000 return true; + else if (pns.equalsIgnoreCase("null")) + return false; else{ ! int pn = Integer.parseInt(pns); if(pn>0){ return true; |
|
From: jai <yg...@us...> - 2010-11-06 17:35:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29486 Modified Files: oscarResources_en.properties Log Message: - ID: 3104263 -text for inbox Index: oscarResources_en.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v retrieving revision 1.351 retrieving revision 1.352 diff -C2 -d -r1.351 -r1.352 *** oscarResources_en.properties 5 Nov 2010 01:47:24 -0000 1.351 --- oscarResources_en.properties 6 Nov 2010 17:35:42 -0000 1.352 *************** *** 1968,1976 **** inboxmanager.document.FlagProviderMsg=Flag Provider: inboxmanager.document.SuccessfullySavedMsg=Successfully saved inboxmanager.document.NextAppointmentMsg=Next Appointment: inboxmanager.document.LinkedProvidersMsg=Linked Providers inboxmanager.documents=Docs inboxmanager.notAssignedDocs=Not Assigned Docs ! dms.documentReport.title=DOCUMENT MANAGEMENT SYSTEM dms.documentReport.msgDelete=Are you sure you want to delete --- 1968,1978 ---- inboxmanager.document.FlagProviderMsg=Flag Provider: inboxmanager.document.SuccessfullySavedMsg=Successfully saved + inboxmanager.document.SaveAndNext=Save & Next inboxmanager.document.NextAppointmentMsg=Next Appointment: inboxmanager.document.LinkedProvidersMsg=Linked Providers inboxmanager.documents=Docs inboxmanager.notAssignedDocs=Not Assigned Docs ! inboxmanager.documentsInQueues=Documents In Queues ! inboxmanager.document.pendingDocs=Pending Docs dms.documentReport.title=DOCUMENT MANAGEMENT SYSTEM dms.documentReport.msgDelete=Are you sure you want to delete *************** *** 2628,2632 **** oscarEncounter.formRourke2009_4.formupDownStairs=Walks up/down stairs alternating feet oscarEncounter.formRourke2009_4.formundoesZippers=Undoes buttons and zippers ! oscarEncounter.formRourke2009_4.form2Directions=Understands 2 and 3 step directions (eg. \u201CPick up your hat and shoes and put them in the closet.\u201D) oscarEncounter.formRourke2009_4.form5ormoreWords= Uses sentences with 5 or more words oscarEncounter.formRourke2009_4.formwalksUpStairs=Walks up stairs using handrail --- 2630,2634 ---- oscarEncounter.formRourke2009_4.formupDownStairs=Walks up/down stairs alternating feet oscarEncounter.formRourke2009_4.formundoesZippers=Undoes buttons and zippers ! oscarEncounter.formRourke2009_4.form2Directions=Understands 2 and 3 step directions (eg. \u201cPick up your hat and shoes and put them in the closet.\u201d) oscarEncounter.formRourke2009_4.form5ormoreWords= Uses sentences with 5 or more words oscarEncounter.formRourke2009_4.formwalksUpStairs=Walks up stairs using handrail *************** *** 4559,4563 **** pager.header.title=Resultado: pager.max.page.index=10 ! pager.next.desc=Pr\u00F3ximo pager.prev.desc=Anterior --- 4561,4565 ---- pager.header.title=Resultado: pager.max.page.index=10 ! pager.next.desc=Pr\u00f3ximo pager.prev.desc=Anterior |
|
From: jai <yg...@us...> - 2010-11-06 17:35:30
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29405 Modified Files: struts-config.xml Log Message: - ID: 3104263 -show docs in queues Index: struts-config.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v retrieving revision 1.357 retrieving revision 1.358 diff -C2 -d -r1.357 -r1.358 *** struts-config.xml 4 Nov 2010 06:25:15 -0000 1.357 --- struts-config.xml 6 Nov 2010 17:35:23 -0000 1.358 *************** *** 628,631 **** --- 628,632 ---- <forward name="doclabPreview" path="/dms/previewDocHL7Inbox.jsp" /> <forward name="dms_index" path="/oscarMDS/Index.jsp" /> + <forward name="document_in_queues" path="/oscarMDS/documentsInQueues.jsp" /> </action> |
|
From: jai <yg...@us...> - 2010-11-06 17:35:15
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/share/javascript In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv28830 Modified Files: oscarMDSIndex.js Log Message: - ID: 3104263 -add methods to show docs in queue -dynamic load doc/labs as user scroll down -update side navigation when showing docs in queues -update global data Index: oscarMDSIndex.js =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/share/javascript/oscarMDSIndex.js,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** oscarMDSIndex.js 27 Oct 2010 17:56:31 -0000 1.15 --- oscarMDSIndex.js 6 Nov 2010 17:35:06 -0000 1.16 *************** *** 21,25 **** --- 21,41 ---- */ + var nowChildId; + var nowDocLabIds=new Array(); + var nowMultiple=1; + + function showDocInQueue(qid){ + $('docs').innerHTML=''; + var docs=queueDocNos[qid]; + nowChildId='docs'; + nowMultiple=1; + nowDocLabIds=new Array(); + for(var i=docs.length-1;i>-1;i--){ + var docid=docs[i]; + nowDocLabIds.push(docid); + } + showFirstTime(); + } function updateLabDemoStatus(labno){ *************** *** 34,38 **** --- 50,59 ---- /************init global data methods*****************/ + function initQueueIdDocs(s){ + var r=new Array(); + s=s.replace('{',''); + s=s.replace('}',''); + } function initPatientIds(s){ *************** *** 135,139 **** return sar; }else{ ! var re=new Arrays(); return re; } --- 156,160 ---- return sar; }else{ ! var re=new Array(); return re; } *************** *** 340,347 **** hideTopBtn(); } - - } function popupStart(vheight,vwidth,varpage) { popupStart(vheight,vwidth,varpage,"helpwindow"); --- 361,394 ---- hideTopBtn(); } } + function popupMsg(width, height,docid) { + var dn=$('demofind'+docid).value; + var saved=$('saved'+docid).value; + var b=false; + //console.log('saved'+saved); + if(dn==-1 || saved=='false'){ + if(confirm('Document is not linked with a patient, do you still want to Msg?')){ + b=true; + } + }else{ + b=true; + } + if(b){ + var url='../oscarMessenger/SendDemoMessage.do?'+'demographic_no='+dn; + popup(width,height,url,'msg'); + } + } + + function popupTickler(width, height,docid) { + var dn=$('demofind'+docid).value; + var saved=$('saved'+docid).value; + if(dn==-1 || saved=='false'){ + alert('Please link document with a patient'); + }else{ + var url="../tickler/ForwardDemographicTickler.do?docType=DOC&demographic_no="+dn+"&docId="+docid; + popup(width,height,url,'Tickler'); + } + } function popupStart(vheight,vwidth,varpage) { popupStart(vheight,vwidth,varpage,"helpwindow"); *************** *** 357,360 **** --- 404,413 ---- windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes"; var popup=window.open(varpage, windowname, windowprops); + if (popup != null) { + if (popup.opener == null) { + popup.opener = self; + } + popup.focus(); + } } *************** *** 429,433 **** } ! function showDocLab(childId,docNo,providerNo,searchProviderNo,status,demoName,showhide){//showhide is 0 = document currently hidden, 1=currently shown //create child element in docViews docNo=docNo.replace(' ','');//trim --- 482,552 ---- } ! ! ! function isNeedShowMore(wh,sd){//input window height and scrool distance , return true if need to scroll down. ! var r=false; ! if(wh*nowMultiple < sd){ ! r=true; ! nowMultiple++; ! } ! return r; ! } ! function showFirstTime(){//show first five doc labs ! ! for(var i=0;i<5;i++){//show 5 ! if(nowDocLabIds.length>0){ ! var id=nowDocLabIds.pop(); ! id=id.replace(" ",""); ! if(id && id.length>0) { ! var ackStatus=getAckStatusFromDocLabId(id); ! var patientId=getPatientIdFromDocLabId(id); ! var patientName=getPatientNameFromPatientId(patientId); ! if(i==0){if(current_first_doclab==0) current_first_doclab=id;} ! showDocLab(nowChildId,id,providerNo,searchProviderNo,ackStatus,patientName); ! } ! } ! } ! } ! function bufferAndShow(){//show 5 if scroll down to a certain extend relative to the window ! var wh=f_clientHeight();//window_height ! var sd=f_scrollTop();//scroll_distance ! var showMore=isNeedShowMore(wh,sd); ! if(showMore){ ! for(var i=0;i<5;i++){//show 5 ! if(nowDocLabIds.length>0){ ! var id=nowDocLabIds.pop(); ! id=id.replace(" ",""); ! if(id && id.length>0) { ! var ackStatus=getAckStatusFromDocLabId(id); ! var patientId=getPatientIdFromDocLabId(id); ! var patientName=getPatientNameFromPatientId(patientId); ! showDocLab(nowChildId,id,providerNo,searchProviderNo,ackStatus,patientName); ! } ! } ! } ! } ! ! } ! function f_clientHeight() { ! return f_filterResults ( ! window.innerHeight ? window.innerHeight : 0, ! document.documentElement ? document.documentElement.clientHeight : 0, ! document.body ? document.body.clientHeight : 0 ! ); ! } ! function f_scrollTop() { ! return f_filterResults ( ! window.pageYOffset ? window.pageYOffset : 0, ! document.documentElement ? document.documentElement.scrollTop : 0, ! document.body ? document.body.scrollTop : 0 ! ); ! } ! function f_filterResults(n_win, n_docel, n_body) { ! var n_result = n_win ? n_win : 0; ! if (n_docel && (!n_result || (n_result > n_docel))) ! n_result = n_docel; ! return n_body && (!n_result || (n_result > n_body)) ? n_body : n_result; ! } ! function showDocLab(childId,docNo,providerNo,searchProviderNo,status,demoName,inQueue){//showhide is 0 = document currently hidden, 1=currently shown //create child element in docViews docNo=docNo.replace(' ','');//trim *************** *** 453,457 **** //oscarLog('url='+url); var data="segmentID="+docNo+"&providerNo="+providerNo+"&searchProviderNo="+searchProviderNo+"&status="+status+"&demoName="+demoName; ! //oscarLog('url='+url+'+-+ \n data='+data); new Ajax.Updater(div,url,{method:'get',parameters:data,insertion:Insertion.Bottom,evalScripts:true,onSuccess:function(transport){ focusFirstDocLab(); --- 572,580 ---- //oscarLog('url='+url); var data="segmentID="+docNo+"&providerNo="+providerNo+"&searchProviderNo="+searchProviderNo+"&status="+status+"&demoName="+demoName; ! if(inQueue) ! data+="&inQueue=true"; ! else ! data+="&inQueue=false"; ! // oscarLog('url='+url+'+-+ \n data='+data+"----div:"+div); new Ajax.Updater(div,url,{method:'get',parameters:data,insertion:Insertion.Bottom,evalScripts:true,onSuccess:function(transport){ focusFirstDocLab(); *************** *** 1011,1022 **** clearDocView(); createNewElement('docViews',childId); ! for(var i=0;i<ids.length;i++){ var docLabId=ids[i].replace(/\s/g,''); ! var ackStatus=getAckStatusFromDocLabId(docLabId); ! var patientId=getPatientIdFromDocLabId(docLabId); ! var patientName=getPatientNameFromPatientId(patientId); ! if(current_first_doclab==0) current_first_doclab=docLabId; ! showDocLab(childId,docLabId,providerNo,searchProviderNo,ackStatus,patientName,ab_normal+'show'); } } } --- 1134,1150 ---- clearDocView(); createNewElement('docViews',childId); ! nowChildId=childId; ! nowMultiple=1; ! nowDocLabIds=new Array(); ! //console.log("nowDocLabIds"); ! //console.log(ids); ! for(var i=ids.length-1;i>-1;i--){//push in reverse so pop first to last var docLabId=ids[i].replace(/\s/g,''); ! //console.log(docLabId); ! nowDocLabIds.push(docLabId); ! //console.log(nowDocLabIds); } + //console.log(nowDocLabIds); + showFirstTime(); } } *************** *** 1031,1047 **** clearDocView(); createNewElement('docViews',childId); ! for(var i=0;i<labdocsArr.length;i++){ var labdoc=labdocsArr[i]; labdoc=labdoc.replace(' ',''); //oscarLog('check type input='+labdoc); var type=checkType(labdoc); ! var ackStatus=getAckStatusFromDocLabId(labdoc); ! var patientName=getPatientNameFromPatientId(patientId); ! if(current_first_doclab==0) current_first_doclab=labdoc; //oscarLog("type="+type+"--subType="+subType); ! if(type==subType) ! showDocLab(childId,labdoc,providerNo,searchProviderNo,ackStatus,patientName,'subtype'+subType+patientId+'show'); ! else; } //toggleMarker('subtype'+subType+patientId+'show'); //} --- 1159,1178 ---- clearDocView(); createNewElement('docViews',childId); ! nowChildId=childId; ! nowMultiple=1; ! nowDocLabIds=new Array(); ! for(var i=labdocsArr.length-1;i>-1;i--){ var labdoc=labdocsArr[i]; labdoc=labdoc.replace(' ',''); //oscarLog('check type input='+labdoc); var type=checkType(labdoc); ! //oscarLog("type="+type+"--subType="+subType); ! if(type==subType){ ! nowDocLabIds.push(labdoc); ! } ! } + showFirstTime(); //toggleMarker('subtype'+subType+patientId+'show'); //} *************** *** 1051,1054 **** --- 1182,1187 ---- function getPatientNameFromPatientId(patientId){ var pn=patientIdNames[patientId]; + //console.log("in getpatientnamefrompatientid"); + //console.log(patientIdNames); if(pn&&pn!=null){ return pn; *************** *** 1056,1065 **** --- 1189,1201 ---- var url=contextpath+"/dms/ManageDocument.do"; var data='method=getDemoNameAjax&demo_no='+patientId; + //console.log('in getp '+patientId); new Ajax.Request(url,{method:'post',parameters:data,onSuccess:function(transport){ var json=transport.responseText.evalJSON(); + //console.log("onsuccess=="+json); if(json!=null ){ var pn=json.demoName;//get name from id addPatientIdName(patientId,pn); addPatientId(patientId); + //console.log("PN ="+pn); return pn; } *************** *** 1073,1088 **** function showAllDocLabs(){ clearDocView(); for(var i=0;i<patientIds.length;i++){ var id=patientIds[i]; //oscarLog("ids in showalldoclabs="+id); if(id.length>0){ ! showThisPatientDocs(id,true); ! } } ! } ! function showCategory(cat){ if(cat.length>0){ var sA=getDocLabFromCat(cat); --- 1209,1237 ---- function showAllDocLabs(){ + + clearDocView(); + var childId='showTotalDocLabs'; + createNewElement('docViews',childId); + nowChildId=childId; + nowMultiple=1; + nowDocLabIds=new Array(); for(var i=0;i<patientIds.length;i++){ var id=patientIds[i]; //oscarLog("ids in showalldoclabs="+id); if(id.length>0){ ! //oscarLog("patientId in show this patientdocs="+patientId); ! var labDocsArr=getLabDocFromPatientId(id); ! if(labDocsArr!=null && labDocsArr.length>0){ ! for(var j=labDocsArr.length-1;j>-1;j--){ ! var docId=labDocsArr[j].replace(' ', ''); ! nowDocLabIds.push(docId); ! } ! } } } ! showFirstTime(); } ! function showCategory(cat){//show in document or hl7 if(cat.length>0){ var sA=getDocLabFromCat(cat); *************** *** 1094,1114 **** clearDocView(); createNewElement('docViews',childId); ! for(var i=0;i<sA.length;i++){ var docLabId=sA[i]; docLabId=docLabId.replace(/\s/g, ""); ! //oscarLog("docLabId="+docLabId); ! var patientId=getPatientIdFromDocLabId(docLabId); ! //oscarLog("patientId="+patientId); ! var patientName=getPatientNameFromPatientId(patientId); ! var ackStatus=getAckStatusFromDocLabId(docLabId); ! //oscarLog("patientName="+patientName); ! //oscarLog("ackStatus="+ackStatus); ! ! if(patientName!=null) { ! if(current_first_doclab==0) current_first_doclab=docLabId; ! showDocLab(childId,docLabId,providerNo,searchProviderNo,ackStatus,patientName,cat+'show'); ! } } ! } } --- 1243,1255 ---- clearDocView(); createNewElement('docViews',childId); ! nowChildId=childId; ! nowMultiple=1; ! nowDocLabIds=new Array(); ! for(var i=sA.length-1;i>-1;i--){ var docLabId=sA[i]; docLabId=docLabId.replace(/\s/g, ""); ! nowDocLabIds.push(docLabId); } ! showFirstTime(); } } *************** *** 1137,1141 **** //console.log(notUsedPid); for(var i=0;i<notUsedPid.length;i++){ - removePatientId(notUsedPid[i]); } --- 1278,1281 ---- *************** *** 1146,1151 **** return patientDocs[patientId]; } ! ! function showThisPatientDocs(patientId,keepPrevious){ //oscarLog("patientId in show this patientdocs="+patientId); var labDocsArr=getLabDocFromPatientId(patientId); --- 1286,1290 ---- return patientDocs[patientId]; } ! function showThisPatientDocs(patientId,keepPrevious){//show doclabs belong to this patient //oscarLog("patientId in show this patientdocs="+patientId); var labDocsArr=getLabDocFromPatientId(patientId); *************** *** 1156,1169 **** //if(toggleElement(childId)); //else{ ! if(keepPrevious); ! else clearDocView(); createNewElement('docViews',childId); ! for(var i=0;i<labDocsArr.length;i++){ var docId=labDocsArr[i].replace(' ', ''); ! if(current_first_doclab==0) current_first_doclab=docId; ! var ackStatus=getAckStatusFromDocLabId(docId); ! //oscarLog('childId='+childId+',docId='+docId+',ackStatus='+ackStatus); ! showDocLab(childId,docId,providerNo,searchProviderNo,ackStatus,patientName,'labdoc'+patientId+'show'); } } } --- 1295,1309 ---- //if(toggleElement(childId)); //else{ ! //if(keepPrevious); ! clearDocView(); createNewElement('docViews',childId); ! nowChildId=childId; ! nowMultiple=1; ! nowDocLabIds=new Array(); ! for(var i=labDocsArr.length-1;i>-1;i--){ var docId=labDocsArr[i].replace(' ', ''); ! nowDocLabIds.push(docId); } + showFirstTime(); } } *************** *** 1205,1209 **** } ! function updateDocLabData(doclabid){//remove doclabid from global variables //console.log('in updatedoclabdata='+doclabid); if(doclabid){ --- 1345,1349 ---- } ! function updateDocLabData(doclabid,inQueue){//remove doclabid from global variables //console.log('in updatedoclabdata='+doclabid); if(doclabid){ *************** *** 1211,1217 **** //trim doclabid doclabid=doclabid.replace(/\s/g,''); ! updateSideNav(doclabid); //console.log('aa_aa11'); ! hideRowUsingId(doclabid); //console.log('aa_aa'); //change typeDocLab --- 1351,1358 ---- //trim doclabid doclabid=doclabid.replace(/\s/g,''); ! updateSideNav(doclabid,inQueue); //console.log('aa_aa11'); ! if(inQueue){;} ! else hideRowUsingId(doclabid); //console.log('aa_aa'); //change typeDocLab *************** *** 1254,1258 **** return 'abnormal'; } ! function updateSideNav(doclabid){ //oscarLog('in updatesidenav'); var n=$('totalNumDocs').innerHTML; --- 1395,1461 ---- return 'abnormal'; } ! function removeDocFromQueue(docid){ ! //console.log('before removal '); ! //console.log(queueDocNos); ! var found=false; ! for(i in queueDocNos){ ! var r=queueDocNos[i]; ! //console.log('when r is '); ! //console.log(r); ! for(var j=0;j<r.length;j++){ ! if(r[j]==docid){ ! //remove it ! r.splice(j,1); ! //console.log('after splice, j is'+j); ! //console.log(r); ! queueDocNos[i]=r; ! found=true; ! break; ! }else{ ! ! } ! } ! if(found) ! break;//break the outer for loop. ! } ! //console.log('after removal '); ! //console.log(queueDocNos); ! } ! ! function updateSideNavInQueue(docid){ ! //console.log('in updateSide'); ! var foundQ=''; ! //find which queueid the doc is in ! for(var i in queueDocNos){ ! var r=queueDocNos[i]; ! for(var j=0;j<r.length;j++){ ! if(r[j]==docid){ ! foundQ=i; ! //console.log('match found foundQ='+foundQ); ! break; ! } ! } ! if(foundQ==i) ! break; ! } ! //console.log('foundQ='+foundQ); ! //descrease the queue's doc number by 1 ! if(foundQ.length>0){ ! var n=$('docNo_'+foundQ).innerHTML; ! //console.log('not found11'); ! n=parseInt(n); ! //console.log('not found22'); ! if(n>0){ ! //console.log('not found33'); ! $('docNo_'+foundQ).innerHTML=n-1; ! } ! } ! //console.log('not found44'); ! ! } ! function updateSideNav(doclabid, inqueue){ ! if(inqueue) ! updateSideNavInQueue(doclabid); ! else{ //oscarLog('in updatesidenav'); var n=$('totalNumDocs').innerHTML; *************** *** 1324,1330 **** } } ! function getRowIdFromDocLabId(doclabid){ var rowid; for(var i=0;i<doclabid_seq.length;i++){ if(doclabid==doclabid_seq[i]){ --- 1527,1538 ---- } } ! } function getRowIdFromDocLabId(doclabid){ var rowid; + //console.log('getRowIdFromDocLabId '+doclabid); + if(doclabid_sql){ + //console.log("doclabid_sql"); + //console.log(doclabid_sql); + for(var i=0;i<doclabid_seq.length;i++){ if(doclabid==doclabid_seq[i]){ *************** *** 1333,1336 **** --- 1541,1546 ---- } } + + } return rowid; } *************** *** 1341,1345 **** doclabid=doclabid.replace(' ',''); rowid=getRowIdFromDocLabId(doclabid); ! $(rowid).remove(); } } --- 1551,1555 ---- doclabid=doclabid.replace(' ',''); rowid=getRowIdFromDocLabId(doclabid); ! if($(rowid)) $(rowid).remove(); } } *************** *** 1362,1366 **** /***methos for showDocument.jsp***/ ! function updateGlobalDataAndSideNav(doclabid,patientId){ doclabid=doclabid.replace(/\s/g,''); if(doclabid.length>0){ --- 1572,1576 ---- /***methos for showDocument.jsp***/ ! function addDocToPatient(doclabid,patientId){//if doc is previously not assigned to a patient, add it to a patient's list of docs doclabid=doclabid.replace(/\s/g,''); if(doclabid.length>0){ *************** *** 1433,1436 **** --- 1643,1647 ---- var url=contextpath+"/dms/ManageDocument.do"; var data='method=getDemoNameAjax&demo_no='+patientId; + //console.log('in cre '+patientId); new Ajax.Request(url,{method:'post',parameters:data,onSuccess:function(transport){ var json=transport.responseText.evalJSON(); *************** *** 1497,1512 **** } } ! function popupStart(vheight,vwidth,varpage,windowname) { ! //oscarLog("in popupStart "); ! if(!windowname) ! windowname="helpwindow"; ! var page = varpage; ! var windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes"; ! //oscarLog(varpage); ! //oscarLog(windowname); ! //oscarLog(windowprops); ! var popup=window.open(varpage, windowname, windowprops); ! } ! function updateDocument(eleId){//save doc info var url="../dms/ManageDocument.do",data=$(eleId).serialize(true); new Ajax.Request(url,{method:'post',parameters:data,onSuccess:function(transport){ --- 1708,1725 ---- } } ! ! function saveNext(docid){ ! updateDocument('forms_'+docid,true); ! ! } ! function updateDocStatusInQueue(docid){//change status of queue document link row to I=inactive ! //console.log('in updateDocStatusInQueue, docid '+docid); ! var url="../dms/inboxManage.do",data="docid="+docid+"&method=updateDocStatusInQueue"; ! new Ajax.Request(url,{method:'post',parameters:data,onSuccess:function(transport){}}); ! ! ! } ! ! function updateDocument(eleId,isNext){//save doc info var url="../dms/ManageDocument.do",data=$(eleId).serialize(true); new Ajax.Request(url,{method:'post',parameters:data,onSuccess:function(transport){ *************** *** 1522,1534 **** $("saveSucessMsg_"+num).show(); $('saved'+num).value='true'; ! ! var success= updateGlobalDataAndSideNav(num,patientId); if(success){ success=updatePatientDocLabNav(num,patientId); if(success){ //disable demo input ! $('autocompletedemo'+num).disabled=true; //console.log('updated by save'); //console.log(patientDocs); } } --- 1735,1763 ---- $("saveSucessMsg_"+num).show(); $('saved'+num).value='true'; ! //console.log('before update global data'); ! var success= addDocToPatient(num,patientId); ! //console.log('result of update global data='+success); if(success){ success=updatePatientDocLabNav(num,patientId); + //console.log('result of update patient doc lab nav '+success); if(success){ + //console.log('before disable autocompletedemo '+num+'--'+$('autocompletedemo'+num)); //disable demo input ! if($('autocompletedemo'+num)) ! $('autocompletedemo'+num).disabled=true; //console.log('updated by save'); //console.log(patientDocs); + //console.log("isNext "+isNext); + if(isNext){ + //console.log("isNext is true"); + //blind up + Effect.BlindUp('labdoc_'+num); + //make the document out of the queue + updateDocStatusInQueue(num); + //update side navigation for queue + updateSideNav(num,true); + //remove doc from queueDocNos + removeDocFromQueue(num); + } } } *************** *** 1538,1542 **** } ! function updateStatus(formid){//acknowledge var num=formid.split("_"); var doclabid=num[1]; --- 1767,1775 ---- } ! function updateStatus(formid,inQueue){//acknowledge ! if(inQueue) ! //console.log('inqueue is boolean true'); ! if(inQueue=='true') ! //console.log('inqueue is string true'); var num=formid.split("_"); var doclabid=num[1]; *************** *** 1551,1559 **** new Ajax.Request(url,{method:'post',parameters:data,onSuccess:function(transport){ ! if(doclabid){ Effect.BlindUp('labdoc_'+doclabid); ! updateDocLabData(doclabid); ! } }}); --- 1784,1800 ---- new Ajax.Request(url,{method:'post',parameters:data,onSuccess:function(transport){ ! //console.log('after updatestatus ,doclabid '+doclabid); if(doclabid){ Effect.BlindUp('labdoc_'+doclabid); ! updateDocLabData(doclabid,inQueue); ! if(inQueue){ ! //console.log(' inqueue is true '); ! //make the document out of the queue ! updateDocStatusInQueue(doclabid); ! //remove doc from queueDocNos ! removeDocFromQueue(doclabid); ! }else{ ! //console.log('inqueue is false'); ! } } }}); |
|
From: jai <yg...@us...> - 2010-11-06 17:34:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv28715 Modified Files: Index.jsp Log Message: - ID: 3104263 -add scroll observe event Index: Index.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS/Index.jsp,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** Index.jsp 27 Oct 2010 17:56:11 -0000 1.53 --- Index.jsp 6 Nov 2010 17:34:39 -0000 1.54 *************** *** 117,120 **** --- 117,124 ---- </style> <script type="text/javascript" > + Event.observe(window,'scroll',function(){//check for scrolling + bufferAndShow(); + }); + var tabindex=0; var current_first_doclab=0; *************** *** 232,236 **** | <a href="javascript:popupStart(600,500,'../dms/html5AddDocuments.jsp')" style="color: #FFFFFF; "><bean:message key="inboxmanager.document.uploadDoc"/></a> | <a href="javascript:void(0);" onclick="changeView();" style="color: #FFFFFF;"><bean:message key="inboxmanager.document.changeView"/></a> ! </td> </tr> --- 236,240 ---- | <a href="javascript:popupStart(600,500,'../dms/html5AddDocuments.jsp')" style="color: #FFFFFF; "><bean:message key="inboxmanager.document.uploadDoc"/></a> | <a href="javascript:void(0);" onclick="changeView();" style="color: #FFFFFF;"><bean:message key="inboxmanager.document.changeView"/></a> ! | <a href="javascript:popupStart(700,1100,'../dms/inboxManage.do?method=getDocumentsInQueues')" style="color: #FFFFFF;"><bean:message key="inboxmanager.document.pendingDocs"/></a> </td> </tr> |
|
From: jai <yg...@us...> - 2010-11-06 17:34:30
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv28675 Modified Files: showDocument.jsp Log Message: - ID: 3104263 -add save and next button -change tickler and msg button -other small changes Index: showDocument.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms/showDocument.jsp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** showDocument.jsp 28 Sep 2010 18:16:17 -0000 1.15 --- showDocument.jsp 6 Nov 2010 17:34:22 -0000 1.16 *************** *** 15,18 **** --- 15,22 ---- String searchProviderNo = request.getParameter("searchProviderNo"); String status = request.getParameter("status"); + String inQueue=request.getParameter("inQueue"); + boolean inQueueB=false; + if(inQueue!=null && inQueue.equals("true")) + inQueueB=true; String creator = (String) session.getAttribute("user"); *************** *** 86,89 **** --- 90,94 ---- //enable Save button whenever a selection is made $('save<%=docId%>').enable(); + $('saveNext<%=docId%>').enable(); }); *************** *** 236,240 **** <tr> <td><bean:message key="inboxmanager.document.DemographicMsg" /></td> ! <td><%if(!demographicID.equals("-1")){%> <input id="saved<%=docId%>" type="hidden" name="saved" value="true"/> <input type="hidden" value="<%=demographicID%>" name="demog" id="demofind<%=docId%>" /> --- 241,246 ---- <tr> <td><bean:message key="inboxmanager.document.DemographicMsg" /></td> ! <td><% ! if(!demographicID.equals("-1")){%> <input id="saved<%=docId%>" type="hidden" name="saved" value="true"/> <input type="hidden" value="<%=demographicID%>" name="demog" id="demofind<%=docId%>" /> *************** *** 248,252 **** <input id="saved_<%=docId%>" type="hidden" name="saved" value="false"/> ! <input id="mrp_<%=docId%>" type="checkbox" onclick="sendMRP(this)" name="demoLink" ><bean:message key="inboxmanager.document.SendToMRPMsg" /> <a id="mrp_fail_<%=docId%>" style="color:red;font-style: italic;display: none;" ><bean:message key="inboxmanager.document.SendToMRPFailedMsg" /></a> </td> --- 254,258 ---- <input id="saved_<%=docId%>" type="hidden" name="saved" value="false"/> ! <br><input id="mrp_<%=docId%>" type="checkbox" onclick="sendMRP(this)" name="demoLink" ><bean:message key="inboxmanager.document.SendToMRPMsg" /> <a id="mrp_fail_<%=docId%>" style="color:red;font-style: italic;display: none;" ><bean:message key="inboxmanager.document.SendToMRPFailedMsg" /></a> </td> *************** *** 273,278 **** <tr> ! <td colspan="2" align="right"><a id="saveSucessMsg_<%=docId%>" style="display:none;color:blue;"><bean:message key="inboxmanager.document.SuccessfullySavedMsg"/></a><%if(!demographicID.equals("-1")){%><input type="submit" name="save" id="save<%=docId%>" value="Save" /><%} else{%><input type="submit" name="save" id="save<%=docId%>" disabled value="Save" /> <%}%> ! </tr> --- 279,286 ---- <tr> ! <td width="30%" colspan="1" align="right"><a id="saveSucessMsg_<%=docId%>" style="display:none;color:blue;"><bean:message key="inboxmanager.document.SuccessfullySavedMsg"/></a></td> ! <td width="30%" colspan="1" align="right"><%if(!demographicID.equals("-1")){%><input type="submit" name="save" id="save<%=docId%>" value="Save" /><input type="button" name="save" id="saveNext<%=docId%>" onclick="saveNext(<%=docId%>)" value='<bean:message key="inboxmanager.document.SaveAndNext"/>' /><%} ! else{%><input type="submit" name="save" id="save<%=docId%>" disabled value="Save" /><input type="button" name="save" onclick="saveNext(<%=docId%>)" id="saveNext<%=docId%>" disabled value='<bean:message key="inboxmanager.document.SaveAndNext"/>' /> <%}%> ! </tr> *************** *** 287,291 **** <%for (ProviderInboxItem pItem : routeList) { String s=p.getProperty(pItem.getProviderNo(), pItem.getProviderNo()); ! if(!s.equals("0")){ %> <li><%=s%></li> <%} --- 295,300 ---- <%for (ProviderInboxItem pItem : routeList) { String s=p.getProperty(pItem.getProviderNo(), pItem.getProviderNo()); ! ! if(!s.equals("0")&&!s.equals("null")){ %> <li><%=s%></li> <%} *************** *** 357,361 **** <input type="hidden" name="ajax" value="yes" /> </form> ! <form name="acknowledgeForm_<%=docId%>" id="acknowledgeForm_<%=docId%>" onsubmit="updateStatus('acknowledgeForm_<%=docId%>');" method="post" action="javascript:void(0);"> <table width="100%" height="100%" border="0" cellspacing="0" cellpadding="0"> --- 366,370 ---- <input type="hidden" name="ajax" value="yes" /> </form> ! <form name="acknowledgeForm_<%=docId%>" id="acknowledgeForm_<%=docId%>" onsubmit="updateStatus('acknowledgeForm_<%=docId%>',<%=inQueueB%>);" method="post" action="javascript:void(0);"> <table width="100%" height="100%" border="0" cellspacing="0" cellpadding="0"> *************** *** 382,387 **** <input type="button" id="printBtn_<%=docId%>" value=" <bean:message key="global.btnPrint"/> " onClick="popup(700,960,'<%=url2%>','file download')"> <% if (demographicID != null && !demographicID.equals("") && !demographicID.equalsIgnoreCase("null")) {%> ! <input type="button" id="msgBtn_<%=docId%>" value="Msg" onclick="popup(700,960,'../oscarMessenger/SendDemoMessage.do?demographic_no=<%=demographicID%>','msg')"/> ! <input type="button" id="ticklerBtn_<%=docId%>" value="Tickler" onclick="popup(450,600,'../tickler/ForwardDemographicTickler.do?docType=DOC&docId=<%=docId%>&demographic_no=<%=demographicID%>','tickler')"/> <% } --- 391,396 ---- <input type="button" id="printBtn_<%=docId%>" value=" <bean:message key="global.btnPrint"/> " onClick="popup(700,960,'<%=url2%>','file download')"> <% if (demographicID != null && !demographicID.equals("") && !demographicID.equalsIgnoreCase("null")) {%> ! <input type="button" id="msgBtn_<%=docId%>" value="Msg" onclick="popupMsg(700,960,'<%=docId%>');"/> ! <input type="button" id="ticklerBtn_<%=docId%>" value="Tickler" onclick="popupTickler(450,600,'<%=docId%>')"/> <% } |
|
From: jai <yg...@us...> - 2010-11-06 17:33:49
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv28592 Added Files: documentsInQueues.jsp Log Message: - ID: 3104263 -show docs in queues --- NEW FILE: documentsInQueues.jsp --- <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ page import="java.util.*, oscar.util.*, oscar.OscarProperties, oscar.dms.*, oscar.dms.data.*"%> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Documents In Queues</title> <script type="text/javascript" src="<%= request.getContextPath() %>/share/javascript/oscarMDSIndex.js"></script> <script type="text/javascript" src="<%= request.getContextPath() %>/share/javascript/prototype.js"></script> <!-- main calendar program --> <script type="text/javascript" src="../share/calendar/calendar.js"></script> <!-- language for the calendar --> <script type="text/javascript" src="../share/calendar/lang/<bean:message key='global.javascript.calendar'/>"></script> <!-- the following script defines the Calendar.setup helper function, which makes adding a calendar a matter of 1 or 2 lines of code. --> <script type="text/javascript" src="../share/calendar/calendar-setup.js"></script> <!-- calendar style sheet --> <link rel="stylesheet" type="text/css" media="all" href="../share/calendar/calendar.css" title="win2k-cold-1" /> <link rel="stylesheet" type="text/css" href="../share/css/OscarStandardLayout.css"> <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script> <script type="text/javascript" src="<%= request.getContextPath() %>/share/javascript/prototype.js"></script> <script type="text/javascript" src="<%= request.getContextPath() %>/share/javascript/effects.js"></script> <script type="text/javascript" src="<%= request.getContextPath() %>/share/javascript/Oscar.js"></script> <script type="text/javascript" src="../share/javascript/controls.js"></script> <script type="text/javascript" src="../share/yui/js/yahoo-dom-event.js"></script> <script type="text/javascript" src="../share/yui/js/connection-min.js"></script> <script type="text/javascript" src="../share/yui/js/animation-min.js"></script> <script type="text/javascript" src="../share/yui/js/datasource-min.js"></script> <script type="text/javascript" src="../share/yui/js/autocomplete-min.js"></script> <script type="text/javascript" src="../js/demographicProviderAutocomplete.js"></script> <link rel="stylesheet" type="text/css" href="../share/yui/css/fonts-min.css"/> <link rel="stylesheet" type="text/css" href="../share/yui/css/autocomplete.css"/> <link rel="stylesheet" type="text/css" media="all" href="../share/css/demographicProviderAutocomplete.css" /> <link rel="stylesheet" type="text/css" media="all" href="../share/css/oscarMDSIndex.css" /> <style type="text/css"> .Cell{ background-color:#9999CC; border-color:#CCCCFF #6666CC #6666CC #CCCCFF; border-left:thin solid #CCCCFF; border-right:thin solid #6666CC; border-style:solid; border-width:thin; height:0px; } </style> </head> <body> <% Hashtable queueIdNames=(Hashtable)request.getAttribute("queueIdNames");//each queue id has a corresponding name Hashtable queueDocNos=(Hashtable)request.getAttribute("queueDocNos");//one queue id is linked to a list of docs String providerNo=(String)request.getAttribute("providerNo"); String searchProviderNo=(String)request.getAttribute("searchProviderNo"); Enumeration keys=queueDocNos.keys(); String patientIdNamesStr=(String)request.getAttribute("patientIdNamesStr"); Hashtable docStatus=(Hashtable)request.getAttribute("docStatus"); String patientIdStr =(String)request.getAttribute("patientIdStr"); Hashtable typeDocLab =(Hashtable)request.getAttribute("typeDocLab"); Hashtable docType=(Hashtable)request.getAttribute("docType"); Hashtable patientDocs=(Hashtable)request.getAttribute("patientDocs"); List<String> normals=(List<String>)request.getAttribute("normals"); List<String> abnormals=(List<String>)request.getAttribute("abnormals"); %> <table id="pendingDocs" width="100%"> <tr oldclass="MainTableTopRow"> <td class="MainTableTopRowRightColumn" colspan="2" align="left"> <table width="100%"> <tr > <td align="center" colspan="2" class="Nav" valign="center"><span class="white"><bean:message key="inboxmanager.documentsInQueues"/></span></td> </tr> <tr> <td align="left" valign="center" > <input type="hidden" name="providerNo" value="<%= providerNo %>"> <input type="hidden" name="searchProviderNo" value="<%= searchProviderNo %>"> <%= (request.getParameter("lname") == null ? "" : "<input type=\"hidden\" name=\"lname\" value=\""+request.getParameter("lname")+"\">") %> <%= (request.getParameter("fname") == null ? "" : "<input type=\"hidden\" name=\"fname\" value=\""+request.getParameter("fname")+"\">") %> <%= (request.getParameter("hnum") == null ? "" : "<input type=\"hidden\" name=\"hnum\" value=\""+request.getParameter("hnum")+"\">") %> <input type="hidden" name="selectedProviders"> <input type="button" class="smallButton" onclick="window.close();" value="<bean:message key="oscarMDS.index.btnClose"/>" </td> <td align="right" valign="center" width="30%"> <a href="javascript:popupStart(300,400,'../oscarEncounter/Help.jsp')" style="color: #FFFFFF;"><bean:message key="global.help"/></a> | <a href="javascript:popupStart(300,400,'../oscarEncounter/About.jsp')" style="color: #FFFFFF;" ><bean:message key="global.about"/></a> </td> </tr> </table> </td> </tr> <tr> <th class="Cell" align="left" valign="bottom" nowrap>Queues</th> <th class="Cell" align="left" valign="bottom" nowrap>Documents</th> </tr> <tr > <td valign="top" id="queueNames" width="20%"> <% while(keys.hasMoreElements()){ Integer qId=(Integer)keys.nextElement(); String name=(String)queueIdNames.get(qId); List dos=(List)queueDocNos.get(qId); Integer numberOfDocs=dos.size(); %> <a href="javascript:void(0);" onclick="resetCurrentFirstDocLab();showDocInQueue('<%=qId%>')"><%=name%> (<span id="docNo_<%=qId%>"><%=numberOfDocs%></span>)</a><br/> <%}%> </td> <td valign="top" id="docs" width="80%"></td> </tr> </table> <script type="text/javascript"> var current_first_doclab=0; var typeDocLab=initTypeDocLab('<%=typeDocLab%>'); //{DOC=[357, 317, 316], HL7=[38, 33, 30, 28]} var docType=initDocType('<%=docType%>'); //{357=DOC, 38=HL7, 317=DOC, 316=DOC, 33=HL7, 30=HL7, 28=HL7} var patientDocs=initPatientDocs('<%=patientDocs%>');//{2=[316, 30, 28], 1=[33], -1=[357, 317, 38]} var patientIdNames=initPatientIdNames('<%=patientIdNamesStr%>');//;2=TEST2, PATIENT2;1=Zrrr, Srrr;-1=Not, Assigned var docStatus=initDocStatus('<%=docStatus%>');//{357=A, 38=N, 317=A, 316=A, 33=N, 30=N, 28=N} var normals=initNormals('<%=normals%>');//[357, 317, 316, 38, 33, 30, 28] var abnormals=initAbnormals('<%=abnormals%>');//[123,567] var patientIds=initPatientIds('<%=patientIdStr%>'); var queueDocNos=initHashtableWithList('<%=queueDocNos%>'); var providerNo='<%=providerNo%>'; var searchProviderNo='<%=searchProviderNo%>'; /*console.log(typeDocLab); console.log(docType); console.log(patientDocs); console.log(patientIdNames); console.log(docStatus); console.log(normals); console.log(abnormals); console.log(patientIds); console.log(queueDocNos); console.log(providerNo); console.log(searchProviderNo);*/ var types=['DOC']; var contextpath='<%=request.getContextPath()%>'; Event.observe(window,'scroll',function(){//check for scrolling bufferAndShow(); }); </script> </body> </html> |
|
From: annie <ann...@us...> - 2010-11-05 21:25:14
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv1126/database/mysql/caisi/updates Added Files: Tag: RELEASE_10_06 patch-2010-06-01-only-for-oscar.sql Log Message: --- NEW FILE: patch-2010-06-01-only-for-oscar.sql --- insert into `secRole` (role_name, description) values('psychiatrist', 'psychiatrist'); insert into `secRole` (role_name, description) values('RN', 'Registered Nurse'); insert into `secRole` (role_name, description) values('RPN', 'Registered Practical Nurse'); insert into `secRole` (role_name, description) values('Nurse Manager', 'Nurse Manager'); insert into `secRole` (role_name, description) values('Clinical Social Worker','Clinical Social Worker'); insert into `secRole` (role_name, description) values('Clinical Case Manager','Clinical Case Manager'); insert into `secRole` (role_name, description) values('Medical Secretary', 'Medical Secretary'); insert into `secRole` (role_name, description) values('Clinical Assistant', 'Clinical Assistant'); insert into `secRole` (role_name, description) values('secretary', 'secretary'); insert into `secRole` (role_name, description) values('counsellor', 'counsellor'); insert into `secRole` (role_name, description) values('Case Manager', 'Case Manager'); insert into `secRole` (role_name, description) values('Housing Worker', 'Housing Worker'); insert into `secRole` (role_name, description) values('Support Worker', 'Support Worker'); insert into `secRole` (role_name, description) values('Client Service Worker', 'Client Service Worker'); insert into `secRole` (role_name, description) values('Recreation Therapist', 'Recreation Therapist'); insert into access_type (name, type) values("read ticklers assigned to a doctor","access"); insert into access_type (name, type) values("read ticklers assigned to a psychiatrist","access"); insert into access_type (name, type) values("write psychiatrist issues","access"); insert into access_type (name, type) values("read psychiatrist issues","access"); insert into access_type (name, type) values("read psychiatrist notes","access"); insert into access_type (name, type) values("read ticklers assigned to a RN","access"); insert into access_type (name, type) values("write RN issues","access"); insert into access_type (name, type) values("read RN issues","access"); insert into access_type (name, type) values("read RN notes","access"); insert into access_type (name, type) values("read ticklers assigned to a RPN","access"); insert into access_type (name, type) values("write RPN issues","access"); insert into access_type (name, type) values("read RPN issues","access"); insert into access_type (name, type) values("read RPN notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Nurse Manager","access"); insert into access_type (name, type) values("write Nurse Manager issues","access"); insert into access_type (name, type) values("read Nurse Manager issues","access"); insert into access_type (name, type) values("read Nurse Manager notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Clinical Social Worker","access"); insert into access_type (name, type) values("write Clinical Social Worker issues","access"); insert into access_type (name, type) values("read Clinical Social Worker issues","access"); insert into access_type (name, type) values("read Clinical Social Worker notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Clinical Case Manager","access"); insert into access_type (name, type) values("write Clinical Case Manager issues","access"); insert into access_type (name, type) values("read Clinical Case Manager issues","access"); insert into access_type (name, type) values("read Clinical Case Manager notes","access"); insert into access_type (name, type) values("read ticklers assigned to a counsellor","access"); insert into access_type (name, type) values("read ticklers assigned to a Case Manager","access"); insert into access_type (name, type) values("write Case Manager issues","access"); insert into access_type (name, type) values("read Case Manager issues","access"); insert into access_type (name, type) values("read Case Manager notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Housing Worker","access"); insert into access_type (name, type) values("write Housing Worker issues","access"); insert into access_type (name, type) values("read Housing Worker issues","access"); insert into access_type (name, type) values("read Housing Worker notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Medical Secretary","access"); insert into access_type (name, type) values("write Medical Secretary issues","access"); insert into access_type (name, type) values("read Medical Secretary issues","access"); insert into access_type (name, type) values("read Medical Secretary notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Clinical Assistant","access"); insert into access_type (name, type) values("write Clinical Assistant issues","access"); insert into access_type (name, type) values("read Clinical Assistant issues","access"); insert into access_type (name, type) values("read Clinical Assistant notes","access"); insert into access_type (name, type) values("read ticklers assigned to a secretary","access"); insert into access_type (name, type) values("write secretary issues","access"); insert into access_type (name, type) values("read secretary issues","access"); insert into access_type (name, type) values("read secretary notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Support Worker","access"); insert into access_type (name, type) values("write Support Worker issues","access"); insert into access_type (name, type) values("read Support Worker issues","access"); insert into access_type (name, type) values("read Support Worker notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Client Service Worker","access"); insert into access_type (name, type) values("write Client Service Worker issues","access"); insert into access_type (name, type) values("read Client Service Worker issues","access"); insert into access_type (name, type) values("read Client Service Worker notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Recreation Therapist","access"); insert into access_type (name, type) values("write Recreation Therapist issues","access"); insert into access_type (name, type) values("read Recreation Therapist issues","access"); insert into access_type (name, type) values("read Recreation Therapist notes","access"); |
|
From: annie <ann...@us...> - 2010-11-05 21:13:22
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/caisi/updates In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30922/database/mysql/caisi/updates Added Files: patch-2010-06-01-only-for-oscar.sql Log Message: --- NEW FILE: patch-2010-06-01-only-for-oscar.sql --- insert into `secRole` (role_name, description) values('psychiatrist', 'psychiatrist'); insert into `secRole` (role_name, description) values('RN', 'Registered Nurse'); insert into `secRole` (role_name, description) values('RPN', 'Registered Practical Nurse'); insert into `secRole` (role_name, description) values('Nurse Manager', 'Nurse Manager'); insert into `secRole` (role_name, description) values('Clinical Social Worker','Clinical Social Worker'); insert into `secRole` (role_name, description) values('Clinical Case Manager','Clinical Case Manager'); insert into `secRole` (role_name, description) values('Medical Secretary', 'Medical Secretary'); insert into `secRole` (role_name, description) values('Clinical Assistant', 'Clinical Assistant'); insert into `secRole` (role_name, description) values('secretary', 'secretary'); insert into `secRole` (role_name, description) values('counsellor', 'counsellor'); insert into `secRole` (role_name, description) values('Case Manager', 'Case Manager'); insert into `secRole` (role_name, description) values('Housing Worker', 'Housing Worker'); insert into `secRole` (role_name, description) values('Support Worker', 'Support Worker'); insert into `secRole` (role_name, description) values('Client Service Worker', 'Client Service Worker'); insert into `secRole` (role_name, description) values('Recreation Therapist', 'Recreation Therapist'); insert into access_type (name, type) values("read ticklers assigned to a doctor","access"); insert into access_type (name, type) values("read ticklers assigned to a psychiatrist","access"); insert into access_type (name, type) values("write psychiatrist issues","access"); insert into access_type (name, type) values("read psychiatrist issues","access"); insert into access_type (name, type) values("read psychiatrist notes","access"); insert into access_type (name, type) values("read ticklers assigned to a RN","access"); insert into access_type (name, type) values("write RN issues","access"); insert into access_type (name, type) values("read RN issues","access"); insert into access_type (name, type) values("read RN notes","access"); insert into access_type (name, type) values("read ticklers assigned to a RPN","access"); insert into access_type (name, type) values("write RPN issues","access"); insert into access_type (name, type) values("read RPN issues","access"); insert into access_type (name, type) values("read RPN notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Nurse Manager","access"); insert into access_type (name, type) values("write Nurse Manager issues","access"); insert into access_type (name, type) values("read Nurse Manager issues","access"); insert into access_type (name, type) values("read Nurse Manager notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Clinical Social Worker","access"); insert into access_type (name, type) values("write Clinical Social Worker issues","access"); insert into access_type (name, type) values("read Clinical Social Worker issues","access"); insert into access_type (name, type) values("read Clinical Social Worker notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Clinical Case Manager","access"); insert into access_type (name, type) values("write Clinical Case Manager issues","access"); insert into access_type (name, type) values("read Clinical Case Manager issues","access"); insert into access_type (name, type) values("read Clinical Case Manager notes","access"); insert into access_type (name, type) values("read ticklers assigned to a counsellor","access"); insert into access_type (name, type) values("read ticklers assigned to a Case Manager","access"); insert into access_type (name, type) values("write Case Manager issues","access"); insert into access_type (name, type) values("read Case Manager issues","access"); insert into access_type (name, type) values("read Case Manager notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Housing Worker","access"); insert into access_type (name, type) values("write Housing Worker issues","access"); insert into access_type (name, type) values("read Housing Worker issues","access"); insert into access_type (name, type) values("read Housing Worker notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Medical Secretary","access"); insert into access_type (name, type) values("write Medical Secretary issues","access"); insert into access_type (name, type) values("read Medical Secretary issues","access"); insert into access_type (name, type) values("read Medical Secretary notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Clinical Assistant","access"); insert into access_type (name, type) values("write Clinical Assistant issues","access"); insert into access_type (name, type) values("read Clinical Assistant issues","access"); insert into access_type (name, type) values("read Clinical Assistant notes","access"); insert into access_type (name, type) values("read ticklers assigned to a secretary","access"); insert into access_type (name, type) values("write secretary issues","access"); insert into access_type (name, type) values("read secretary issues","access"); insert into access_type (name, type) values("read secretary notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Support Worker","access"); insert into access_type (name, type) values("write Support Worker issues","access"); insert into access_type (name, type) values("read Support Worker issues","access"); insert into access_type (name, type) values("read Support Worker notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Client Service Worker","access"); insert into access_type (name, type) values("write Client Service Worker issues","access"); insert into access_type (name, type) values("read Client Service Worker issues","access"); insert into access_type (name, type) values("read Client Service Worker notes","access"); insert into access_type (name, type) values("read ticklers assigned to a Recreation Therapist","access"); insert into access_type (name, type) values("write Recreation Therapist issues","access"); insert into access_type (name, type) values("read Recreation Therapist issues","access"); insert into access_type (name, type) values("read Recreation Therapist notes","access"); |
|
From: Ronnie C. <cr...@us...> - 2010-11-05 21:07:56
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29849 Modified Files: providercontrol.jsp Log Message: rollback changes in 1.38 "updatepreference..." line is needed for changing group view Index: providercontrol.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/providercontrol.jsp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** providercontrol.jsp 20 Oct 2010 22:02:52 -0000 1.38 --- providercontrol.jsp 5 Nov 2010 21:07:48 -0000 1.39 *************** *** 72,75 **** --- 72,76 ---- {"month" , "appointmentprovideradminmonth.jsp"}, {"addstatus" , "provideraddstatus.jsp"}, + {"updatepreference" , "providerupdatepreference.jsp"}, {"displaymygroup" , "providerdisplaymygroup.jsp"}, {"encounter" , "providerencounter.jsp"}, |
