diff --git a/trunk/WEB-INF/classes/siprp/pagina/ScheduleServlet.java b/trunk/WEB-INF/classes/siprp/pagina/ScheduleServlet.java
index d171fbab..14d8654c 100644
--- a/trunk/WEB-INF/classes/siprp/pagina/ScheduleServlet.java
+++ b/trunk/WEB-INF/classes/siprp/pagina/ScheduleServlet.java
@@ -38,6 +38,7 @@ public class ScheduleServlet extends MailerServlet
throws IOException
{
ServletOutputStream out = res.getOutputStream();
+ String queryString = req.getQueryString();
res.setContentType( "text/html" );
Hashtable parameters = new Hashtable();
@@ -55,13 +56,22 @@ public class ScheduleServlet extends MailerServlet
parameters.put( ESTABELECIMENTO, session.getAttribute( "session_estabelecimento_nome" ) );
parameters.put( FUNCIONARIO, session.getAttribute( "session_funcionario_nome" ) );
- out.println( showPage( "marcacao/marcacao_menu.html", parameters ) );
+ String tokens[] = queryString.split( "[?]" );
+ if( tokens.length > 0 && tokens[ tokens.length - 1 ].equals( "consulta" ) )
+ {
+ out.println( showPage( "marcacao/marcacao_consulta.html", parameters ) );
+ }
+ else
+ {
+ out.println( showPage( "marcacao/marcacao_exame.html", parameters ) );
+ }
}
public void doPost( HttpServletRequest req, HttpServletResponse res )
- throws IOException
+ throws IOException
{
ServletOutputStream out = res.getOutputStream();
+ String queryString = req.getQueryString();
res.setContentType( "text/html" );
// Info de marcacao
diff --git a/trunk/html/marcacao/CalendarPopup.js b/trunk/html/marcacao/CalendarPopup.js
index 664c3c06..a5817732 100644
--- a/trunk/html/marcacao/CalendarPopup.js
+++ b/trunk/html/marcacao/CalendarPopup.js
@@ -189,8 +189,8 @@ function AnchorPosition_getWindowOffsetTop (el) {
// "MMM dd, yyyy hh:mm:ssa" matches: "January 01, 2000 12:30:45AM"
// ------------------------------------------------------------------
-var MONTH_NAMES=new Array('January','February','March','April','May','June','July','August','September','October','November','December','Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
-var DAY_NAMES=new Array('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sun','Mon','Tue','Wed','Thu','Fri','Sat');
+var MONTH_NAMES=new Array('Janeiro','Fevereiro','Março','Abril','Maio','Junho','Julho','Agosto','Setembro','Outobro','Novembro','Dezembro','Jan','Fev','Mar','Abr','Mai','Jun','Jul','Ago','Set','Out','Nov','Dez');
+var DAY_NAMES=new Array('Domingo','Segunda','Terça','Quarta','Quinta','Sexta','Sábado','Dom','Seg','Ter','Qua','Qui','Sex','Sab');
function LZ(x) {return(x<0||x>9?"":"0")+x}
// ------------------------------------------------------------------
@@ -913,7 +913,7 @@ cal.addDisabledDates("January 01, 2003", "Dec 31, 2003");
cal.setYearSelectStartOffset(2);
// Text for the word "Today" appearing on the calendar
-cal.setTodayText("Today");
+cal.setTodayText("Hoje");
// The calendar uses CSS classes for formatting. If you want your calendar to
// have unique styles, you can set the prefix that will be added to all the
diff --git a/trunk/html/marcacao/marcacao_consulta.html b/trunk/html/marcacao/marcacao_consulta.html
index ceef3db0..8f8fde0e 100644
--- a/trunk/html/marcacao/marcacao_consulta.html
+++ b/trunk/html/marcacao/marcacao_consulta.html
@@ -4,6 +4,7 @@
Marcação de consulta
+
+ | Data: | dd/mm/aaaa
+
+ |
| Hora: | hh:mm |
diff --git a/trunk/html/user.html b/trunk/html/user.html
index 1b4b4c77..868bd345 100644
--- a/trunk/html/user.html
+++ b/trunk/html/user.html
@@ -141,6 +141,16 @@ td.box6
m_wnd = window.open( "schedule?" + Math.random(), "marcacao_window", "menubar=0, resizeable=0, width=400, height=250, top=100, left=450" );
m_wnd.focus();
}
+ function marcacaoConsultaWindow()
+ {
+ m_wnd = window.open( "schedule?consulta", "marcacao_window", "menubar=0, resizeable=0, width=400, height=250, top=100, left=450" );
+ m_wnd.focus();
+ }
+ function marcacaoExamesWindow()
+ {
+ m_wnd = window.open( "schedule?exames", "marcacao_window", "menubar=0, resizeable=0, width=400, height=250, top=100, left=450" );
+ m_wnd.focus();
+ }