';
+ // Define width the day row.
+}
+
+function ds_template_main_below() {
+ return '
'
+ + '
';
+}
+
+// This one draws calendar...
+function ds_draw_calendar(m, y) {
+ // First clean the output buffer.
+ ds_ob_clean();
+ // Here we go, do the header
+ ds_echo (ds_template_main_above(ds_monthnames[m - 1] + ' ' + y));
+ for (i = 0; i < 7; i ++) {
+ ds_echo (ds_template_day_row(ds_daynames[i]));
+ }
+ // Make a date object.
+ var ds_dc_date = new Date();
+ ds_dc_date.setMonth(m - 1);
+ ds_dc_date.setFullYear(y);
+ ds_dc_date.setDate(1);
+ if (m == 1 || m == 3 || m == 5 || m == 7 || m == 8 || m == 10 || m == 12) {
+ days = 31;
+ } else if (m == 4 || m == 6 || m == 9 || m == 11) {
+ days = 30;
+ } else {
+ days = (y % 4 == 0) ? 29 : 28;
+ }
+ var first_day = ds_dc_date.getDay();
+ var first_loop = 1;
+ // Start the first week
+ ds_echo (ds_template_new_week());
+ // If sunday is not the first day of the month, make a blank cell...
+ if (first_day != 0) {
+ ds_echo (ds_template_blank_cell(first_day));
+ }
+ var j = first_day;
+ for (i = 0; i < days; i ++) {
+ // Today is sunday, make a new week.
+ // If this sunday is the first day of the month,
+ // we've made a new row for you already.
+ if (j == 0 && !first_loop) {
+ // New week!!
+ ds_echo (ds_template_new_week());
}
- else {
- getObj('v'+d).innerHTML=' ';
- getObj('v'+parseInt(d)).onmouseover=null;
- getObj('v'+parseInt(d)).onmouseout=null;
- getObj('v'+parseInt(d)).style.cursor='default';
- }
+ // Make a row of that day!
+ ds_echo (ds_template_day(i + 1, m, y));
+ // This is not first loop anymore...
+ first_loop = 0;
+ // What is the next day?
+ j ++;
+ j %= 7;
}
+ // Do the footer
+ ds_echo (ds_template_main_below());
+ // And let's display..
+ ds_ob_flush();
+ // Scroll it into view.
+ ds_ce.scrollIntoView();
}
-prepcalendar('',ccm,ccy);
-//getObj('fc'+cc).style.visibility='hidden';
-
-function caddm() {
- marr=((ccy%4)==0)?mnl:mnn;
-
- ccm+=1;
- if (ccm>=12) {
- ccm=0;
- ccy++;
- }
- cdayf();
- prepcalendar('',ccm,ccy);
+// A function to show the calendar.
+// When user click on the date, it will set the content of t.
+function ds_sh(t) {
+ // Set the element to set...
+ ds_element = t;
+ // Make a new date, and set the current month and year.
+ var ds_sh_date = new Date();
+ ds_c_month = ds_sh_date.getMonth() + 1;
+ ds_c_year = ds_sh_date.getFullYear();
+ // Draw the calendar
+ ds_draw_calendar(ds_c_month, ds_c_year);
+ // To change the position properly, we must show it first.
+ ds_ce.style.display = '';
+ // Move the calendar container!
+ the_left = ds_getleft(t);
+ the_top = ds_gettop(t) + t.offsetHeight;
+ ds_ce.style.left = the_left + 'px';
+ ds_ce.style.top = the_top + 'px';
+ // Scroll it into view.
+ ds_ce.scrollIntoView();
}
-function csubm() {
- marr=((ccy%4)==0)?mnl:mnn;
-
- ccm-=1;
- if (ccm<0) {
- ccm=11;
- ccy--;
- }
- cdayf();
- prepcalendar('',ccm,ccy);
+// Hide the calendar.
+function ds_hi() {
+ ds_ce.style.display = 'none';
}
-function cdayf() {
-if ((ccy>sccy)|((ccy==sccy)&&(ccm>=sccm)))
- return;
-else {
- ccy=sccy;
- ccm=sccm;
- cfd=scfd;
+// Moves to the next month...
+function ds_nm() {
+ // Increase the current month.
+ ds_c_month ++;
+ // We have passed December, let's go to the next year.
+ // Increase the current year, and set the current month to January.
+ if (ds_c_month > 12) {
+ ds_c_month = 1;
+ ds_c_year++;
}
-}
+ // Redraw the calendar.
+ ds_draw_calendar(ds_c_month, ds_c_year);
+}
+
+// Moves to the previous month...
+function ds_pm() {
+ ds_c_month = ds_c_month - 1; // Can't use dash-dash here, it will make the page invalid.
+ // We have passed January, let's go back to the previous year.
+ // Decrease the current year, and set the current month to December.
+ if (ds_c_month < 1) {
+ ds_c_month = 12;
+ ds_c_year = ds_c_year - 1; // Can't use dash-dash here, it will make the page invalid.
+ }
+ // Redraw the calendar.
+ ds_draw_calendar(ds_c_month, ds_c_year);
+}
+
+// Moves to the next year...
+function ds_ny() {
+ // Increase the current year.
+ ds_c_year++;
+ // Redraw the calendar.
+ ds_draw_calendar(ds_c_month, ds_c_year);
+}
+
+// Moves to the previous year...
+function ds_py() {
+ // Decrease the current year.
+ ds_c_year = ds_c_year - 1; // Can't use dash-dash here, it will make the page invalid.
+ // Redraw the calendar.
+ ds_draw_calendar(ds_c_month, ds_c_year);
+}
+
+// Format the date to output.
+function ds_format_date(d, m, y) {
+ // 2 digits month.
+ m2 = '00' + m;
+ m2 = m2.substr(m2.length - 2);
+ // 2 digits day.
+ d2 = '00' + d;
+ d2 = d2.substr(d2.length - 2);
+ // YYYY-MM-DD
+ return y + '-' + m2 + '-' + d2;
+}
+
+// When the user clicks the day.
+function ds_onclick(d, m, y) {
+ // Hide the calendar.
+ ds_hi();
+ // Set the value of it, if we can.
+ if (typeof(ds_element.value) != 'undefined') {
+ ds_element.value = ds_format_date(d, m, y);
+ // Maybe we want to set the HTML in it.
+ } else if (typeof(ds_element.innerHTML) != 'undefined') {
+ ds_element.innerHTML = ds_format_date(d, m, y);
+ // I don't know how should we display it, just alert it to user.
+ } else {
+ alert (ds_format_date(d, m, y));
+ }
+}
\ No newline at end of file
diff --git a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java
index 603289f..7304fd0 100644
--- a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java
+++ b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java
@@ -68,8 +68,7 @@ public class SArticleController extends SimpleFormController {
System.out.println(e);
}
- Article a = new Article(0, title, theme, nomFile, mainauthor, liste, 1);
- articleManager.addArticle(a);
+ articleManager.addArticle(0, title, theme, nomFile, mainauthor, liste, 1);
return new ModelAndView(new RedirectView(getSuccessView()));
}
diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
index be39b3a..e044389 100644
--- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
+++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
@@ -34,8 +34,14 @@ public class AddConferenceController extends AbstractWizardFormController {
setPages(new String[] {"addConference", "addConference2", "addConference3", "addConference4", "addConference5"});
}
- protected Object formBackingObject(HttpServletRequest request) throws ModelAndViewDefiningException {
- FormConference conference = new FormConference();
+ protected Object formBackingObject(HttpServletRequest request) throws ModelAndViewDefiningException {
+ logger.info("je passe ici");
+ FormConference conference = (FormConference)request.getSession().getAttribute("conference");
+ if (conference==null) {
+ conference = new FormConference();
+ logger.info("je passe ici la 1ère fois");
+ request.getSession().setAttribute("conference", conference);
+ }
return conference;
}
