Menu
▾
▴
unitime-cvs — CVS changes
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(275) |
Jul
(81) |
Aug
(19) |
Sep
(26) |
Oct
(190) |
Nov
(118) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(9) |
Feb
(318) |
Mar
(251) |
Apr
(354) |
May
(209) |
Jun
(261) |
Jul
(226) |
Aug
(136) |
Sep
(156) |
Oct
(30) |
Nov
(5) |
Dec
(13) |
| 2009 |
Jan
(26) |
Feb
(35) |
Mar
(63) |
Apr
(21) |
May
(26) |
Jun
(33) |
Jul
(55) |
Aug
(71) |
Sep
(23) |
Oct
(40) |
Nov
(18) |
Dec
(13) |
| 2010 |
Jan
(17) |
Feb
(98) |
Mar
(39) |
Apr
(25) |
May
(107) |
Jun
(257) |
Jul
(270) |
Aug
(206) |
Sep
(237) |
Oct
(187) |
Nov
(302) |
Dec
(187) |
| 2011 |
Jan
(63) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Nightly B. <no...@un...> - 2010-11-30 23:50:06
|
Download the resultant file at http://www.unitime.org/uct_builds.php, see the attached build and change logs for more details. |
|
From: Tomas M. <to...@us...> - 2010-11-30 22:06:32
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/test In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10239/JavaSource/org/unitime/timetable/test Modified Files: Tag: dev_curriculum MasarykDefaultPreferences.java Log Message: Few more changes - only set preferences when there are none - if there is MM in scheduling notes, require multi-media room - do not set meet with constraints Index: MasarykDefaultPreferences.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/test/Attic/MasarykDefaultPreferences.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** MasarykDefaultPreferences.java 19 Nov 2010 00:23:06 -0000 1.1.2.4 --- MasarykDefaultPreferences.java 30 Nov 2010 22:06:22 -0000 1.1.2.5 *************** *** 22,29 **** import java.util.Collection; import java.util.HashSet; ! import java.util.Hashtable; import java.util.List; import java.util.Properties; - import java.util.Set; import org.apache.log4j.Logger; --- 22,28 ---- import java.util.Collection; import java.util.HashSet; ! import java.util.Iterator; import java.util.List; import java.util.Properties; import org.apache.log4j.Logger; *************** *** 80,84 **** Session session = Session.getSessionUsingInitiativeYearTerm( ApplicationProperties.getProperty("initiative", "FF"), ! ApplicationProperties.getProperty("year","2010"), ApplicationProperties.getProperty("term","Jaro") ); --- 79,83 ---- Session session = Session.getSessionUsingInitiativeYearTerm( ApplicationProperties.getProperty("initiative", "FF"), ! ApplicationProperties.getProperty("year","2011"), ApplicationProperties.getProperty("term","Jaro") ); *************** *** 91,94 **** --- 90,95 ---- } + MakeAssignmentsForClassEvents makePattern = new MakeAssignmentsForClassEvents(session, hibSession); + for (ExactTimeMins x: ExactTimeMinsDAO.getInstance().findAll(hibSession)) { x.setNrSlots(x.getMinsPerMtgMax() / 5); *************** *** 97,107 **** } ! RoomGroup poc = null; //, mult = null, bez = null; for (RoomGroup rg: (Collection<RoomGroup>)RoomGroup.getAllGlobalRoomGroups()) { if (rg.getAbbv().equals("POÄ")) poc = rg; - /* else if (rg.getAbbv().equals("MULT")) mult = rg; else if (rg.getAbbv().equals("BÄŽ")) bez = rg; --- 98,108 ---- } ! RoomGroup poc = null, mult = null; //, bez = null; for (RoomGroup rg: (Collection<RoomGroup>)RoomGroup.getAllGlobalRoomGroups()) { if (rg.getAbbv().equals("POÄ")) poc = rg; else if (rg.getAbbv().equals("MULT")) mult = rg; + /* else if (rg.getAbbv().equals("BÄŽ")) bez = rg; *************** *** 114,118 **** } ! Hashtable<String, Set<Class_>> meetWith = new Hashtable<String, Set<Class_>>(); DistributionType sameDaysType = (DistributionType)hibSession.createQuery( --- 115,119 ---- } ! // Hashtable<String, Set<Class_>> meetWith = new Hashtable<String, Set<Class_>>(); DistributionType sameDaysType = (DistributionType)hibSession.createQuery( *************** *** 125,128 **** --- 126,146 ---- .setLong("sessionId", session.getUniqueId()).list()) { + boolean hasPreferences = false; + if (!ss.getPreferences().isEmpty()) hasPreferences = true; + for (Class_ c: ss.getClasses()) { + if (c.getPreferences().size() > c.getPreferences(TimePref.class).size()) hasPreferences = true; + else for (Iterator i = c.getPreferences(TimePref.class).iterator(); !hasPreferences && i.hasNext(); ) { + TimePref t = (TimePref)i.next(); + TimePatternModel m = t.getTimePatternModel(); + if (!m.isExactTime() && !m.isDefault()) { + hasPreferences = true; + } + } + } + if (hasPreferences) { + continue; + } + sLog.info("Setting " + ss.getSchedulingSubpartLabel() + " ..."); + if (ss.getInstrOfferingConfig().isUnlimitedEnrollment()) { ss.getInstrOfferingConfig().setUnlimitedEnrollment(false); *************** *** 181,184 **** --- 199,207 ---- if (a == null) continue; + if (c.effectiveDatePattern().getName().startsWith("import")) { + c.setDatePattern(makePattern.getDatePattern(c.getEvent())); + } + + /* for (Location location: a.getRooms()) { if (!(location instanceof Room)) continue; *************** *** 191,194 **** --- 214,218 ---- classes.add(c); } + */ // Reset room ratio *************** *** 246,249 **** --- 270,282 ---- } // Room preferences + boolean reqMult = false; + if ("MM".equals(c.getSchedulePrintNote())) { + reqMult = true; + RoomGroupPref gp = new RoomGroupPref(); + gp.setOwner(c); + gp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sRequired)); + gp.setRoomGroup(mult); + c.getPreferences().add(gp); + } for (Location l: a.getRooms()) { if (l instanceof NonUniversityLocation) { *************** *** 278,281 **** --- 311,315 ---- for (RoomGroup rg: l.getRoomGroups()) { if (rg.isGlobal() && rg.getAbbv().equals("MULT")) { + if (reqMult) continue; // already have required MULT RoomGroupPref gp = new RoomGroupPref(); gp.setOwner(c); *************** *** 317,320 **** --- 351,355 ---- + /* DistributionType meetWithType = (DistributionType)hibSession.createQuery( "select d from DistributionType d where d.reference = :type").setString("type", "MEET_WITH").uniqueResult(); *************** *** 342,345 **** --- 377,381 ---- hibSession.flush(); + */ sLog.info("All done."); |
|
From: Tomas M. <to...@us...> - 2010-11-30 21:18:52
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30977/JavaSource/org/unitime/timetable/dataexchange Modified Files: Tag: dev_curriculum BaseCourseOfferingImport.java Log Message: Course offering import -- allow for incremental mode - set by attribute incremental on the root element (boolean, defalts to false) - if incremental, course offerings / courses that are not included in the file are left untouched (i.e., not deleted at the end) Index: BaseCourseOfferingImport.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/dataexchange/BaseCourseOfferingImport.java,v retrieving revision 1.10.2.5 retrieving revision 1.10.2.6 diff -C2 -d -r1.10.2.5 -r1.10.2.6 *** BaseCourseOfferingImport.java 9 Nov 2010 12:25:46 -0000 1.10.2.5 --- BaseCourseOfferingImport.java 30 Nov 2010 21:18:43 -0000 1.10.2.6 *************** *** 90,93 **** --- 90,94 ---- boolean useMeetsWithElement = false; boolean useCanShareRoomElement = false; + boolean incremental = false; PreferenceLevel requiredPrefLevel = null; MakeAssignmentsForClassEvents assignmentHelper = null; *************** *** 113,116 **** --- 114,121 ---- } beginTransaction(); + + incremental = "true".equalsIgnoreCase(rootElement.attributeValue("incremental", "false")); + if (incremental) + info("Incremental mode."); initializeLoad(rootElement, rootElementName); *************** *** 118,123 **** loadOfferings(rootElement); ! deleteUnmatchedInstructionalOfferings(); ! deleteUnmatchedCourseOfferings(); deleteUnmatchedClasses(); commitTransaction(); --- 123,130 ---- loadOfferings(rootElement); ! if (!incremental) { ! deleteUnmatchedInstructionalOfferings(); ! deleteUnmatchedCourseOfferings(); ! } deleteUnmatchedClasses(); commitTransaction(); *************** *** 337,342 **** for(Iterator<Long> cIt = deleteClasses.iterator(); cIt.hasNext(); ){ Long uniqueId = (Long) cIt.next(); ! Class_ unusedC = findClassForUniqueId(uniqueId) ; if (unusedC != null){ addNote("\tDeleted: " + unusedC.getClassLabel()); deleteClass(unusedC); --- 344,356 ---- for(Iterator<Long> cIt = deleteClasses.iterator(); cIt.hasNext(); ){ Long uniqueId = (Long) cIt.next(); ! Class_ unusedC = findClassForUniqueId(uniqueId); if (unusedC != null){ + if (incremental) { + try { + if (existingInstructionalOfferings.contains(unusedC.getSchedulingSubpart().getInstrOfferingConfig().getInstructionalOffering().getUniqueId()) || + existingCourseOfferings.contains(unusedC.getSchedulingSubpart().getInstrOfferingConfig().getInstructionalOffering().getControllingCourseOffering().getUniqueId())) + continue; + } catch (NullPointerException e) {} + } addNote("\tDeleted: " + unusedC.getClassLabel()); deleteClass(unusedC); |
|
From: Tomas M. <to...@us...> - 2010-11-30 18:54:18
|
Update of /cvsroot/unitime/UniTime/WebContent/layouts In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19166/WebContent/layouts Modified Files: Tag: dev_curriculum pageLayout.jsp Log Message: Internet Exploder 8 (and 9) compatibility issues - all GWT pages are now showing the IE / chrome plug-in message - added IE-dependent style sheet - number of small tweaks in the styles for the GWT pages to look at least half decent in IE - course finder dialog (Scheduling Assistant, Edit Curriculum) - for some unknown reason IE has troubles with having two TabPanels and/or ScrollPanels in the dialog -> had to do it differently on IE - set IE rendering mechanism to IE=8 in a hope for some compatibility between different versions of IE - frame dialog moved to a separate class UniTimeFrameDialog - fixed IE notification when frame is loaded - page footer message style changed to better fit the page (smaller font, not-breakable lines, etc.) Index: pageLayout.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/layouts/pageLayout.jsp,v retrieving revision 1.11.2.18 retrieving revision 1.11.2.19 diff -C2 -d -r1.11.2.18 -r1.11.2.19 *** pageLayout.jsp 24 Nov 2010 17:31:55 -0000 1.11.2.18 --- pageLayout.jsp 30 Nov 2010 18:54:09 -0000 1.11.2.19 *************** *** 56,60 **** <meta http-equiv="cache-control" content="no-cache"> <meta http-equiv="expires" content="0"> ! <meta http-equiv="X-UA-Compatible" content="chrome=1"> <style type="text/css">@import url(<%=basePath%>scripts/jscalendar/calendar-blue.css);</style> <link type="text/css" rel="stylesheet" href="<%=basePath%>unitime/gwt/standard/standard.css"> --- 56,60 ---- <meta http-equiv="cache-control" content="no-cache"> <meta http-equiv="expires" content="0"> ! <meta http-equiv="X-UA-Compatible" content="IE=8,chrome=1"> <style type="text/css">@import url(<%=basePath%>scripts/jscalendar/calendar-blue.css);</style> <link type="text/css" rel="stylesheet" href="<%=basePath%>unitime/gwt/standard/standard.css"> *************** *** 180,184 **** <table class="unitime-Footer"> <tr> ! <td width="33%" align="left" nowrap="nowrap" valign="top"><span id="UniTimeGWT:Version"></span> <logic:notEmpty scope="request" name="TimeStamp"> <% --- 180,184 ---- <table class="unitime-Footer"> <tr> ! <td width="33%" align="left" class="unitime-FooterText"><span id="UniTimeGWT:Version"></span> <logic:notEmpty scope="request" name="TimeStamp"> <% *************** *** 193,198 **** </td> <!-- WARNING: Changing or removing the copyright notice will violate the license terms. If you need a different licensing, please contact us at su...@un... --> ! <td width="34%" align="center" valign="top" style="max-width: 300px;"><tt:copy/></td> ! <td width="33%" align="right" valign="top" style="max-width: 300px;"><tt:registration/></td> </tr> <tt:hasProperty name="tmtbl.page.disclaimer"> --- 193,198 ---- </td> <!-- WARNING: Changing or removing the copyright notice will violate the license terms. If you need a different licensing, please contact us at su...@un... --> ! <td width="34%" align="center" class="unitime-FooterText"><tt:copy/></td> ! <td width="33%" align="right" class="unitime-FooterText"><tt:registration/></td> </tr> <tt:hasProperty name="tmtbl.page.disclaimer"> |
|
From: Tomas M. <to...@us...> - 2010-11-30 18:54:17
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/widgets In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19166/JavaSource/org/unitime/timetable/gwt/client/widgets Modified Files: Tag: dev_curriculum WebTable.java UniTimeTabPabel.java Added Files: Tag: dev_curriculum UniTimeFrameDialog.java Log Message: Internet Exploder 8 (and 9) compatibility issues - all GWT pages are now showing the IE / chrome plug-in message - added IE-dependent style sheet - number of small tweaks in the styles for the GWT pages to look at least half decent in IE - course finder dialog (Scheduling Assistant, Edit Curriculum) - for some unknown reason IE has troubles with having two TabPanels and/or ScrollPanels in the dialog -> had to do it differently on IE - set IE rendering mechanism to IE=8 in a hope for some compatibility between different versions of IE - frame dialog moved to a separate class UniTimeFrameDialog - fixed IE notification when frame is loaded - page footer message style changed to better fit the page (smaller font, not-breakable lines, etc.) Index: WebTable.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/widgets/Attic/WebTable.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** WebTable.java 9 Nov 2010 12:25:52 -0000 1.1.2.2 --- WebTable.java 30 Nov 2010 18:54:09 -0000 1.1.2.3 *************** *** 192,195 **** --- 192,203 ---- } iRows = null; + if (showEmptyMessage) + setEmptyMessage(iEmptyMessage); + } + + public void clearData(int keepRows) { + for (int row = iTable.getRowCount() - 1; row >= getHeaderRowsCount() + keepRows; row--) { + iTable.removeRow(row); + } } *************** *** 200,204 **** return; } ! clearData(false); iRows = rows; for (int i=0; i<iRows.length; i++) { --- 208,212 ---- return; } ! clearData(rows.length); iRows = rows; for (int i=0; i<iRows.length; i++) { *************** *** 221,224 **** --- 229,235 ---- iTable.getFlexCellFormatter().setHorizontalAlignment(i+getHeaderRowsCount(), j, cell.getHorizontalAlignment()); } + for (int j=iTable.getCellCount(i+getHeaderRowsCount()) - 1; j >= iRows[i].getNrCells(); j--) { + iTable.clearCell(i+getHeaderRowsCount(), j); + } } } *************** *** 419,422 **** --- 430,434 ---- iPanel.add(iLabel); iIcon.getElement().getStyle().setPaddingRight(3, Unit.PX); + iPanel.setCellVerticalAlignment(iIcon, HasVerticalAlignment.ALIGN_MIDDLE); } *************** *** 501,505 **** --- 513,519 ---- }); p.add(a); + p.setCellVerticalAlignment(a, HasVerticalAlignment.ALIGN_MIDDLE); HTML h = new HTML(text, false); + h.getElement().getStyle().setMarginLeft(2, Unit.PX); p.add(h); iPanel.add(p); Index: UniTimeTabPabel.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/widgets/Attic/UniTimeTabPabel.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** UniTimeTabPabel.java 9 Nov 2010 12:25:52 -0000 1.1.2.2 --- UniTimeTabPabel.java 30 Nov 2010 18:54:09 -0000 1.1.2.3 *************** *** 36,41 **** } ! public void add(Widget w, Widget tabWidget) { ! super.add(w, tabWidget); } --- 36,45 ---- } ! public void add(Widget w, String tabText, boolean asHTML) { ! super.add(w, tabText, asHTML); ! } ! ! public void insert(Widget widget, String tabText, boolean asHTML, int beforeIndex) { ! super.insert(widget, tabText, asHTML, beforeIndex); } *************** *** 56,58 **** --- 60,70 ---- return super.addSelectionHandler(handler); } + + public int getTabCount() { + return getTabBar().getTabCount(); + } + + public int getSelectedTab() { + return getTabBar().getSelectedTab(); + } } --- NEW FILE: UniTimeFrameDialog.java --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ package org.unitime.timetable.gwt.client.widgets; import com.google.gwt.dom.client.FrameElement; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.logical.shared.CloseEvent; import com.google.gwt.event.logical.shared.CloseHandler; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.PopupPanel; /** * @author Tomas Muller */ public class UniTimeFrameDialog extends UniTimeDialogBox { private Frame iFrame = null; private Timer iCheckLoadingWidgetIsShowing = null; private static UniTimeFrameDialog sDialog = null; public UniTimeFrameDialog() { super(true, true); setEscapeToHide(true); iFrame = new MyFrame(); iFrame.getElement().getStyle().setBorderWidth(0, Unit.PX); setWidget(iFrame); iCheckLoadingWidgetIsShowing = new Timer() { @Override public void run() { if (LoadingWidget.getInstance().isShowing()) LoadingWidget.getInstance().fail(getText() + " does not seem to load, " + "please check <a href='" + iFrame.getUrl() + "' style='white-space: nowrap;'>" + iFrame.getUrl() + "</a> for yourself."); } }; addCloseHandler(new CloseHandler<PopupPanel>() { @Override public void onClose(CloseEvent<PopupPanel> event) { if (LoadingWidget.getInstance().isShowing()) LoadingWidget.getInstance().hide(); } }); } public void setFrameUrl(String url) { iFrame.setUrl(url); } public void setFrameSize(String width, String height) { iFrame.setSize(width, height); } public void center() { super.center(); iCheckLoadingWidgetIsShowing.schedule(30000); } public class MyFrame extends Frame { public MyFrame() { super(); hookFrameLoaded((FrameElement)getElement().cast()); } public void onLoad() { super.onLoad(); LoadingWidget.getInstance().show("Loading " + UniTimeFrameDialog.this.getText() + " ..."); } } public static void notifyFrameLoaded() { LoadingWidget.getInstance().hide(); } public static native void hookFrameLoaded(FrameElement element) /*-{ element.onload = function() { @org.unitime.timetable.gwt.client.widgets.UniTimeFrameDialog::notifyFrameLoaded()(); } if (element.addEventListener) { element.addEventListener("load", function() { @org.unitime.timetable.gwt.client.widgets.UniTimeFrameDialog::notifyFrameLoaded()(); }, false); } else if (element.attachEvent) { element.attachEvent("onload", function() { @org.unitime.timetable.gwt.client.widgets.UniTimeFrameDialog::notifyFrameLoaded()(); }); } }-*/; public static native void createTriggers()/*-{ $wnd.showGwtDialog = function(title, source, width, height) { @org.unitime.timetable.gwt.client.widgets.UniTimeFrameDialog::openDialog(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)(title, source, width, height); }; $wnd.hideGwtDialog = function() { @org.unitime.timetable.gwt.client.widgets.UniTimeFrameDialog::hideDialog()(); }; }-*/; public static void openDialog(String title, String source) { openDialog(title, source, null, null); } public static void openDialog(String title, String source, String width, String height) { if (sDialog == null) sDialog = new UniTimeFrameDialog(); else if (sDialog.isShowing()) sDialog.hide(); sDialog.setText(title); sDialog.setFrameUrl(source); String w = (width == null || width.isEmpty() ? String.valueOf(Window.getClientWidth() * 3 / 4) : width); String h = (height == null || height.isEmpty() ? String.valueOf(Window.getClientHeight() * 3 / 4) : height); if (w.endsWith("%")) w = String.valueOf(Integer.parseInt(w.substring(0, w.length() - 1)) * Window.getClientWidth() / 100); if (h.endsWith("%")) h = String.valueOf(Integer.parseInt(h.substring(0, h.length() - 1)) * Window.getClientHeight() / 100); sDialog.setFrameSize(w, h); sDialog.center(); } public static void hideDialog() { if (sDialog != null && sDialog.isShowing()) sDialog.hide(); } } |
|
From: Tomas M. <to...@us...> - 2010-11-30 18:54:17
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/page In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19166/JavaSource/org/unitime/timetable/gwt/client/page Modified Files: Tag: dev_curriculum UniTimePageLabel.java UniTimeSideBar.java UniTimeMenuBar.java Log Message: Internet Exploder 8 (and 9) compatibility issues - all GWT pages are now showing the IE / chrome plug-in message - added IE-dependent style sheet - number of small tweaks in the styles for the GWT pages to look at least half decent in IE - course finder dialog (Scheduling Assistant, Edit Curriculum) - for some unknown reason IE has troubles with having two TabPanels and/or ScrollPanels in the dialog -> had to do it differently on IE - set IE rendering mechanism to IE=8 in a hope for some compatibility between different versions of IE - frame dialog moved to a separate class UniTimeFrameDialog - fixed IE notification when frame is loaded - page footer message style changed to better fit the page (smaller font, not-breakable lines, etc.) Index: UniTimeMenuBar.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/page/Attic/UniTimeMenuBar.java,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** UniTimeMenuBar.java 17 Nov 2010 15:12:27 -0000 1.1.2.7 --- UniTimeMenuBar.java 30 Nov 2010 18:54:08 -0000 1.1.2.8 *************** *** 28,32 **** import org.unitime.timetable.gwt.client.Client.GwtPageChangedHandler; import org.unitime.timetable.gwt.client.widgets.LoadingWidget; ! import org.unitime.timetable.gwt.client.widgets.UniTimeDialogBox; import org.unitime.timetable.gwt.services.MenuService; import org.unitime.timetable.gwt.services.MenuServiceAsync; --- 28,32 ---- import org.unitime.timetable.gwt.client.Client.GwtPageChangedHandler; import org.unitime.timetable.gwt.client.widgets.LoadingWidget; ! import org.unitime.timetable.gwt.client.widgets.UniTimeFrameDialog; import org.unitime.timetable.gwt.services.MenuService; import org.unitime.timetable.gwt.services.MenuServiceAsync; *************** *** 35,42 **** import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; - import com.google.gwt.dom.client.FrameElement; - import com.google.gwt.dom.client.Style.Unit; - import com.google.gwt.event.logical.shared.CloseEvent; - import com.google.gwt.event.logical.shared.CloseHandler; import com.google.gwt.event.logical.shared.ResizeEvent; import com.google.gwt.event.logical.shared.ResizeHandler; --- 35,38 ---- *************** *** 48,57 **** import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Composite; - import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.MenuBar; import com.google.gwt.user.client.ui.MenuItem; import com.google.gwt.user.client.ui.MenuItemSeparator; - import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.SimplePanel; --- 44,51 ---- *************** *** 64,68 **** private MenuBar iMenu; - private Timer iTimer = null; private SimplePanel iSimple = null; --- 58,61 ---- *************** *** 70,75 **** private Timer iMoveTimer; - private static UniTimeDialogBox sDialog = null; - public UniTimeMenuBar(boolean absolute) { iMenu = new MenuBar(); --- 63,66 ---- *************** *** 202,233 **** LoadingWidget.getInstance().show(); if ("dialog".equals(target)) { ! final UniTimeDialogBox dialog = new UniTimeDialogBox(true, true); ! dialog.setEscapeToHide(true); ! final Frame frame = new MyFrame(name); ! frame.getElement().getStyle().setBorderWidth(0, Unit.PX); ! dialog.setWidget(frame); ! dialog.setText(name); ! frame.setUrl(url); ! frame.setSize(String.valueOf(Window.getClientWidth() * 3 / 4), String.valueOf(Window.getClientHeight() * 3 / 4)); ! ! iTimer = new Timer() { ! @Override ! public void run() { ! if (LoadingWidget.getInstance().isShowing()) ! LoadingWidget.getInstance().fail(name + " does not seem to load, " + ! "please check <a href='" + url + "' style='white-space: nowrap;'>" + url + "</a> for yourself."); ! } ! }; ! ! dialog.addCloseHandler(new CloseHandler<PopupPanel>() { ! @Override ! public void onClose(CloseEvent<PopupPanel> event) { ! if (LoadingWidget.getInstance().isShowing()) ! LoadingWidget.getInstance().hide(); ! } ! }); ! ! dialog.center(); ! iTimer.schedule(30000); } else if ("download".equals(target)) { ToolBox.open(url); --- 193,197 ---- LoadingWidget.getInstance().show(); if ("dialog".equals(target)) { ! UniTimeFrameDialog.openDialog(name, url); } else if ("download".equals(target)) { ToolBox.open(url); *************** *** 287,367 **** } } - - public static void notifyFrameLoaded() { - LoadingWidget.getInstance().hide(); - } - - public static class MyFrame extends Frame { - private String iName; - - public MyFrame(String name) { - super(); - iName = name; - hookFremaLoaded((FrameElement)getElement().cast()); - } - - public void onLoad() { - super.onLoad(); - LoadingWidget.getInstance().show("Loading " + iName + " ..."); - } - } - - public static native void hookFremaLoaded(FrameElement element) /*-{ - element.onload = function() { - @org.unitime.timetable.gwt.client.page.UniTimeMenuBar::notifyFrameLoaded()(); - } - }-*/; - - public static native void createTriggers()/*-{ - $wnd.showGwtDialog = function(title, source, width, height) { - @org.unitime.timetable.gwt.client.page.UniTimeMenuBar::openDialog(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)(title, source, width, height); - }; - $wnd.hideGwtDialog = function() { - @org.unitime.timetable.gwt.client.page.UniTimeMenuBar::hideDialog()(); - }; - if ($wnd.onGwtLoad) { - $wnd.onGwtLoad(); - } - }-*/; - - public static void openDialog(final String title, final String source, String width, String height) { - sDialog = new UniTimeDialogBox(true, true); - sDialog.setEscapeToHide(true); - final Frame frame = new MyFrame(title); - frame.getElement().getStyle().setBorderWidth(0, Unit.PX); - sDialog.setWidget(frame); - sDialog.setText(title); - frame.setUrl(source); - String w = (width == null || width.isEmpty() ? String.valueOf(Window.getClientWidth() * 3 / 4) : width); - String h = (height == null || height.isEmpty() ? String.valueOf(Window.getClientHeight() * 3 / 4) : height); - if (w.endsWith("%")) w = String.valueOf(Integer.parseInt(w.substring(0, w.length() - 1)) * Window.getClientWidth() / 100); - if (h.endsWith("%")) h = String.valueOf(Integer.parseInt(h.substring(0, h.length() - 1)) * Window.getClientHeight() / 100); - frame.setSize(w, h); - - Timer timer = new Timer() { - @Override - public void run() { - if (LoadingWidget.getInstance().isShowing()) - LoadingWidget.getInstance().fail(title + " does not seem to load, " + - "please check <a href='" + source + "' style='white-space: nowrap;'>" + source + "</a> for yourself."); - } - }; - - sDialog.addCloseHandler(new CloseHandler<PopupPanel>() { - @Override - public void onClose(CloseEvent<PopupPanel> event) { - if (LoadingWidget.getInstance().isShowing()) - LoadingWidget.getInstance().hide(); - } - }); - - sDialog.center(); - timer.schedule(30000); - } - - public static void hideDialog() { - if (sDialog != null && sDialog.isShowing()) sDialog.hide(); - } - } --- 251,254 ---- Index: UniTimePageLabel.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/page/Attic/UniTimePageLabel.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** UniTimePageLabel.java 9 Nov 2010 12:25:50 -0000 1.1.2.4 --- UniTimePageLabel.java 30 Nov 2010 18:54:08 -0000 1.1.2.5 *************** *** 20,25 **** package org.unitime.timetable.gwt.client.page; ! import org.unitime.timetable.gwt.client.widgets.LoadingWidget; ! import org.unitime.timetable.gwt.client.widgets.UniTimeDialogBox; import org.unitime.timetable.gwt.resources.GwtResources; import org.unitime.timetable.gwt.services.MenuService; --- 20,24 ---- package org.unitime.timetable.gwt.client.page; ! import org.unitime.timetable.gwt.client.widgets.UniTimeFrameDialog; import org.unitime.timetable.gwt.resources.GwtResources; import org.unitime.timetable.gwt.services.MenuService; *************** *** 27,47 **** import com.google.gwt.core.client.GWT; - import com.google.gwt.dom.client.FrameElement; import com.google.gwt.dom.client.Style.Cursor; - import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; - import com.google.gwt.event.logical.shared.CloseEvent; - import com.google.gwt.event.logical.shared.CloseHandler; - import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Composite; - import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.HasVerticalAlignment; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; - import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.RootPanel; --- 26,39 ---- *************** *** 60,64 **** private String iUrl = null; - private Timer iTimer = null; private static UniTimePageLabel sInstance = null; --- 52,55 ---- *************** *** 78,114 **** initWidget(iPanel); ! ! final UniTimeDialogBox dialog = new UniTimeDialogBox(true, true); ! dialog.setEscapeToHide(true); ! final Frame frame = new MyFrame(); ! frame.getElement().getStyle().setBorderWidth(0, Unit.PX); ! dialog.setWidget(frame); ! ! iTimer = new Timer() { ! @Override ! public void run() { ! if (LoadingWidget.getInstance().isShowing()) ! LoadingWidget.getInstance().fail(iName.getText() + " Help does not seem to load, " + ! "please check <a href='" + iUrl + "' style='white-space: nowrap;'>" + iUrl + "</a> for yourself."); ! } ! }; ! ! dialog.addCloseHandler(new CloseHandler<PopupPanel>() { ! @Override ! public void onClose(CloseEvent<PopupPanel> event) { ! if (LoadingWidget.getInstance().isShowing()) ! LoadingWidget.getInstance().hide(); ! } ! }); ! iHelp.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { if (iUrl == null) return; ! dialog.setText(iName.getText() + " Help"); ! frame.setUrl(iUrl); ! frame.setSize(String.valueOf(Window.getClientWidth() * 3 / 4), String.valueOf(Window.getClientHeight() * 3 / 4)); ! dialog.center(); ! iTimer.schedule(30000); } }); --- 69,78 ---- initWidget(iPanel); ! iHelp.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { if (iUrl == null) return; ! UniTimeFrameDialog.openDialog(iName.getText() + " Help", iUrl); } }); *************** *** 149,173 **** }); } - - public static void notifyFrameLoaded() { - LoadingWidget.getInstance().hide(); - } - - public class MyFrame extends Frame { - public MyFrame() { - super(); - hookFremaLoaded((FrameElement)getElement().cast()); - } - - public void onLoad() { - super.onLoad(); - LoadingWidget.getInstance().show("Loading " + iName.getText() + " Help ..."); - } - } - - public native void hookFremaLoaded(FrameElement element) /*-{ - element.onload = function() { - @org.unitime.timetable.gwt.client.page.UniTimePageLabel::notifyFrameLoaded()(); - } - }-*/; } --- 113,115 ---- Index: UniTimeSideBar.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/page/Attic/UniTimeSideBar.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** UniTimeSideBar.java 9 Nov 2010 12:25:50 -0000 1.1.2.4 --- UniTimeSideBar.java 30 Nov 2010 18:54:08 -0000 1.1.2.5 *************** *** 30,34 **** import org.unitime.timetable.gwt.client.Client.GwtPageChangedHandler; import org.unitime.timetable.gwt.client.widgets.LoadingWidget; ! import org.unitime.timetable.gwt.client.widgets.UniTimeDialogBox; import org.unitime.timetable.gwt.resources.GwtResources; import org.unitime.timetable.gwt.services.MenuService; --- 30,34 ---- import org.unitime.timetable.gwt.client.Client.GwtPageChangedHandler; import org.unitime.timetable.gwt.client.widgets.LoadingWidget; ! import org.unitime.timetable.gwt.client.widgets.UniTimeFrameDialog; import org.unitime.timetable.gwt.resources.GwtResources; import org.unitime.timetable.gwt.services.MenuService; *************** *** 37,43 **** import com.google.gwt.core.client.GWT; - import com.google.gwt.dom.client.FrameElement; import com.google.gwt.dom.client.Style.Display; - import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; --- 37,41 ---- *************** *** 59,63 **** import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.DisclosurePanel; - import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.HasHorizontalAlignment; import com.google.gwt.user.client.ui.HasVerticalAlignment; --- 57,60 ---- *************** *** 65,69 **** import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; - import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.SimplePanel; --- 62,65 ---- *************** *** 80,84 **** public static final GwtResources RESOURCES = GWT.create(GwtResources.class); - private Timer iTimer = null; private Timer iScrollTimer = null; --- 76,79 ---- *************** *** 369,400 **** LoadingWidget.getInstance().show(); if ("dialog".equals(target)) { ! final UniTimeDialogBox dialog = new UniTimeDialogBox(true, true); ! dialog.setEscapeToHide(true); ! final Frame frame = new MyFrame(name); ! frame.getElement().getStyle().setBorderWidth(0, Unit.PX); ! dialog.setWidget(frame); ! dialog.setText(name); ! frame.setUrl(url); ! frame.setSize(String.valueOf(Window.getClientWidth() * 3 / 4), String.valueOf(Window.getClientHeight() * 3 / 4)); ! ! iTimer = new Timer() { ! @Override ! public void run() { ! if (LoadingWidget.getInstance().isShowing()) ! LoadingWidget.getInstance().fail(name + " does not seem to load, " + ! "please check <a href='" + url + "' style='white-space: nowrap;'>" + url + "</a> for yourself."); ! } ! }; ! ! dialog.addCloseHandler(new CloseHandler<PopupPanel>() { ! @Override ! public void onClose(CloseEvent<PopupPanel> event) { ! if (LoadingWidget.getInstance().isShowing()) ! LoadingWidget.getInstance().hide(); ! } ! }); ! ! dialog.center(); ! iTimer.schedule(30000); } else if ("download".equals(target)) { ToolBox.open(url); --- 364,368 ---- LoadingWidget.getInstance().show(); if ("dialog".equals(target)) { ! UniTimeFrameDialog.openDialog(name, url); } else if ("download".equals(target)) { ToolBox.open(url); *************** *** 403,431 **** } } - - public static void notifyFrameLoaded() { - LoadingWidget.getInstance().hide(); - } - - public class MyFrame extends Frame { - private String iName; - - public MyFrame(String name) { - super(); - iName = name; - hookFremaLoaded((FrameElement)getElement().cast()); - } - - public void onLoad() { - super.onLoad(); - LoadingWidget.getInstance().show("Loading " + iName + " ..."); - } - } - - public native void hookFremaLoaded(FrameElement element) /*-{ - element.onload = function() { - @org.unitime.timetable.gwt.client.page.UniTimeSideBar::notifyFrameLoaded()(); - } - }-*/; public class MyStackPanel extends StackPanel { --- 371,374 ---- |
|
From: Tomas M. <to...@us...> - 2010-11-30 18:54:17
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/tags In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19166/JavaSource/org/unitime/timetable/tags Modified Files: Tag: dev_curriculum Copyright.java Log Message: Internet Exploder 8 (and 9) compatibility issues - all GWT pages are now showing the IE / chrome plug-in message - added IE-dependent style sheet - number of small tweaks in the styles for the GWT pages to look at least half decent in IE - course finder dialog (Scheduling Assistant, Edit Curriculum) - for some unknown reason IE has troubles with having two TabPanels and/or ScrollPanels in the dialog -> had to do it differently on IE - set IE rendering mechanism to IE=8 in a hope for some compatibility between different versions of IE - frame dialog moved to a separate class UniTimeFrameDialog - fixed IE notification when frame is loaded - page footer message style changed to better fit the page (smaller font, not-breakable lines, etc.) Index: Copyright.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/tags/Attic/Copyright.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 *** Copyright.java 24 Nov 2010 17:31:55 -0000 1.1.2.1 --- Copyright.java 30 Nov 2010 18:54:09 -0000 1.1.2.2 *************** *** 26,29 **** --- 26,33 ---- public class Copyright extends BodyTagSupport { private static final long serialVersionUID = -4463420165596054395L; + private boolean iBr = true; + + public void setBr(boolean br) { iBr = br; } + public boolean isBr() { return iBr; } public int doStartTag() throws JspException { *************** *** 34,39 **** // WARNING: Changing or removing the following copyright notice will violate the license terms. // If you need a different licensing, please contact us at su...@un... ! String body = "<a class='unitime-FooterLink' href='http://www.unitime.org'>© 2008 - 2010 UniTime LLC</a>"; ! body += ", <a class='unitime-FooterLink' href='http://www.unitime.org/uct_license.php'>distributed under GNU General Public License.</a>"; try { pageContext.getOut().print(body); --- 38,45 ---- // WARNING: Changing or removing the following copyright notice will violate the license terms. // If you need a different licensing, please contact us at su...@un... ! String body = ! "<a class='unitime-FooterLink' href='http://www.unitime.org'>© 2008 - 2010 UniTime LLC</a>," + ! (isBr() ? "<br>" : " ") + ! "<a class='unitime-FooterLink' href='http://www.unitime.org/uct_license.php'>distributed under GNU General Public License.</a>"; try { pageContext.getOut().print(body); |
|
From: Tomas M. <to...@us...> - 2010-11-30 18:54:17
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19166/JavaSource/org/unitime/timetable/gwt/client Modified Files: Tag: dev_curriculum Triggers.java Log Message: Internet Exploder 8 (and 9) compatibility issues - all GWT pages are now showing the IE / chrome plug-in message - added IE-dependent style sheet - number of small tweaks in the styles for the GWT pages to look at least half decent in IE - course finder dialog (Scheduling Assistant, Edit Curriculum) - for some unknown reason IE has troubles with having two TabPanels and/or ScrollPanels in the dialog -> had to do it differently on IE - set IE rendering mechanism to IE=8 in a hope for some compatibility between different versions of IE - frame dialog moved to a separate class UniTimeFrameDialog - fixed IE notification when frame is loaded - page footer message style changed to better fit the page (smaller font, not-breakable lines, etc.) Index: Triggers.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/Attic/Triggers.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 *** Triggers.java 17 Nov 2010 15:08:49 -0000 1.1.2.3 --- Triggers.java 30 Nov 2010 18:54:09 -0000 1.1.2.4 *************** *** 21,26 **** import org.unitime.timetable.gwt.client.page.Refresh; - import org.unitime.timetable.gwt.client.page.UniTimeMenuBar; import org.unitime.timetable.gwt.client.widgets.LoadingWidget; import com.google.gwt.user.client.Command; --- 21,26 ---- import org.unitime.timetable.gwt.client.page.Refresh; import org.unitime.timetable.gwt.client.widgets.LoadingWidget; + import org.unitime.timetable.gwt.client.widgets.UniTimeFrameDialog; import com.google.gwt.user.client.Command; *************** *** 41,45 **** gwtDialog(new Command() { public void execute() { ! UniTimeMenuBar.createTriggers(); } }), --- 41,45 ---- gwtDialog(new Command() { public void execute() { ! UniTimeFrameDialog.createTriggers(); } }), |
|
From: Tomas M. <to...@us...> - 2010-11-30 18:54:17
|
Update of /cvsroot/unitime/UniTime/WebContent/WEB-INF/tld In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19166/WebContent/WEB-INF/tld Modified Files: Tag: dev_curriculum timetable.tld Log Message: Internet Exploder 8 (and 9) compatibility issues - all GWT pages are now showing the IE / chrome plug-in message - added IE-dependent style sheet - number of small tweaks in the styles for the GWT pages to look at least half decent in IE - course finder dialog (Scheduling Assistant, Edit Curriculum) - for some unknown reason IE has troubles with having two TabPanels and/or ScrollPanels in the dialog -> had to do it differently on IE - set IE rendering mechanism to IE=8 in a hope for some compatibility between different versions of IE - frame dialog moved to a separate class UniTimeFrameDialog - fixed IE notification when frame is loaded - page footer message style changed to better fit the page (smaller font, not-breakable lines, etc.) Index: timetable.tld =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/WEB-INF/tld/timetable.tld,v retrieving revision 1.11.2.5 retrieving revision 1.11.2.6 diff -C2 -d -r1.11.2.5 -r1.11.2.6 *** timetable.tld 24 Nov 2010 17:31:55 -0000 1.11.2.5 --- timetable.tld 30 Nov 2010 18:54:09 -0000 1.11.2.6 *************** *** 462,465 **** --- 462,471 ---- <tag-class>org.unitime.timetable.tags.Copyright</tag-class> <body-content>JSP</body-content> + <attribute> + <name>br</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <type>java.lang.Boolean</type> + </attribute> </tag> </taglib> |
|
From: Tomas M. <to...@us...> - 2010-11-30 18:54:17
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/sectioning In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19166/JavaSource/org/unitime/timetable/gwt/client/sectioning Modified Files: Tag: dev_curriculum TimeGrid.java CourseSelectionBox.java StudentSectioningWidget.java Log Message: Internet Exploder 8 (and 9) compatibility issues - all GWT pages are now showing the IE / chrome plug-in message - added IE-dependent style sheet - number of small tweaks in the styles for the GWT pages to look at least half decent in IE - course finder dialog (Scheduling Assistant, Edit Curriculum) - for some unknown reason IE has troubles with having two TabPanels and/or ScrollPanels in the dialog -> had to do it differently on IE - set IE rendering mechanism to IE=8 in a hope for some compatibility between different versions of IE - frame dialog moved to a separate class UniTimeFrameDialog - fixed IE notification when frame is loaded - page footer message style changed to better fit the page (smaller font, not-breakable lines, etc.) Index: CourseSelectionBox.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/sectioning/Attic/CourseSelectionBox.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** CourseSelectionBox.java 23 Nov 2010 19:12:43 -0000 1.1.2.5 --- CourseSelectionBox.java 30 Nov 2010 18:54:08 -0000 1.1.2.6 *************** *** 65,68 **** --- 65,69 ---- import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.user.client.Timer; + import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Composite; *************** *** 111,115 **** private Label iFreeTimeError = null, iCoursesTip, iFreeTimeTip; ! private UniTimeTabPabel iTabPanel, iCourseDetailsTabPanel; private HTML iCourseDetails; --- 112,116 ---- private Label iFreeTimeError = null, iCoursesTip, iFreeTimeTip; ! private UniTimeTabPabel iTabPanel, iCourseDetailsTabPanel = null; private HTML iCourseDetails; *************** *** 140,144 **** public CourseSelectionBox(AcademicSessionProvider acadSession, String name, boolean enabled, boolean allowFreeTime) { iAcademicSessionProvider = acadSession; - iAllowFreeTime = allowFreeTime; --- 141,144 ---- *************** *** 289,292 **** --- 289,294 ---- private void openDialog() { if (iDialog == null) { + boolean ie = "Microsoft Internet Explorer".equals(Window.Navigator.getAppName()); + iDialog = new UniTimeDialogBox(true, true); iDialog.setText(MESSAGES.courseSelectionDialog()); *************** *** 309,316 **** iDialogPanel.add(iFilter); iDialogPanel.setCellHorizontalAlignment(iFilter, HasHorizontalAlignment.ALIGN_CENTER); ! ! iCoursesTab = new VerticalPanel(); ! iCoursesTab.setSpacing(10); ! iDialog.addCloseHandler(new CloseHandler<PopupPanel>() { public void onClose(CloseEvent<PopupPanel> event) { --- 311,315 ---- iDialogPanel.add(iFilter); iDialogPanel.setCellHorizontalAlignment(iFilter, HasHorizontalAlignment.ALIGN_CENTER); ! iDialog.addCloseHandler(new CloseHandler<PopupPanel>() { public void onClose(CloseEvent<PopupPanel> event) { *************** *** 325,339 **** iCoursesPanel = new ScrollPanel(iCourses); ! iCoursesPanel.setSize("780", "200"); iCoursesPanel.setStyleName("unitime-ScrollPanel"); - iCoursesTab.add(iCoursesPanel); - - iCourseDetailsTabPanel = new UniTimeTabPabel(); - iCourseDetails = new HTML("<table width='100%'></tr><td class='unitime-TableEmpty'>" + MESSAGES.courseSelectionNoCourseSelected() + "</td></tr></table>"); iCourseDetailsPanel = new ScrollPanel(iCourseDetails); iCourseDetailsPanel.setStyleName("unitime-ScrollPanel-inner"); - iCourseDetailsTabPanel.add(iCourseDetailsPanel, new HTML(MESSAGES.courseSelectionDetails())); iClasses = new WebTable(); --- 324,333 ---- iCoursesPanel = new ScrollPanel(iCourses); ! iCoursesPanel.setSize("780px", "200px"); iCoursesPanel.setStyleName("unitime-ScrollPanel"); iCourseDetails = new HTML("<table width='100%'></tr><td class='unitime-TableEmpty'>" + MESSAGES.courseSelectionNoCourseSelected() + "</td></tr></table>"); iCourseDetailsPanel = new ScrollPanel(iCourseDetails); iCourseDetailsPanel.setStyleName("unitime-ScrollPanel-inner"); iClasses = new WebTable(); *************** *** 354,365 **** iClassesPanel = new ScrollPanel(iClasses); iClassesPanel.setStyleName("unitime-ScrollPanel-inner"); - iCourseDetailsTabPanel.add(iClassesPanel, new HTML(MESSAGES.courseSelectionClasses(), false)); - iCourseDetailsTabPanel.setDeckSize("780", "200"); - iCourseDetailsTabPanel.setDeckStyleName("unitime-TabPanel"); - - iCourseDetailsTabPanel.selectTab(sLastSelectedCourseDetailsTab); - iCoursesTab.add(iCourseDetailsTabPanel); - iCoursesTip = new Label(CONSTANTS.courseTips()[(int)(Math.random() * CONSTANTS.courseTips().length)]); iCoursesTip.setStyleName("unitime-Hint"); --- 348,352 ---- *************** *** 373,380 **** } }); - iCoursesTab.add(iCoursesTip); iTabPanel = new UniTimeTabPabel(); ! iTabPanel.add(iCoursesTab, new HTML(MESSAGES.courseSelectionCourses())); iFreeTimeTab = new VerticalPanel(); --- 360,391 ---- } }); iTabPanel = new UniTimeTabPabel(); ! if (ie) { ! iCoursesPanel.setSize("780px", "400px"); ! iCoursesPanel.setStyleName("unitime-ScrollPanel-inner"); ! iTabPanel.add(iCoursesPanel, MESSAGES.courseSelectionCourses(), true); ! iCourseDetailsPanel.setSize("780px", "400px"); ! iTabPanel.add(iCourseDetailsPanel, MESSAGES.courseSelectionDetails(), true); ! iClassesPanel.setSize("780px", "400px"); ! iTabPanel.add(iClassesPanel, MESSAGES.courseSelectionClasses(), true); ! } else { ! iCourseDetailsTabPanel = new UniTimeTabPabel(); ! iCourseDetailsTabPanel.setDeckSize("780", "200"); ! iCourseDetailsTabPanel.setDeckStyleName("unitime-TabPanel"); ! iCourseDetailsTabPanel.add(iCourseDetailsPanel, MESSAGES.courseSelectionDetails(), true); ! iCourseDetailsTabPanel.add(iClassesPanel, MESSAGES.courseSelectionClasses(), true); ! iCourseDetailsTabPanel.addSelectionHandler(new SelectionHandler<Integer>() { ! public void onSelection(SelectionEvent<Integer> event) { ! sLastSelectedCourseDetailsTab = event.getSelectedItem(); ! } ! }); ! iCoursesTab = new VerticalPanel(); ! iCoursesTab.setSpacing(10); ! iCoursesTab.add(iCoursesPanel); ! iCoursesTab.add(iCourseDetailsTabPanel); ! iCoursesTab.add(iCoursesTip); ! iTabPanel.add(iCoursesTab, MESSAGES.courseSelectionCourses(), true); ! } iFreeTimeTab = new VerticalPanel(); *************** *** 408,417 **** iFreeTimeTab.add(iFreeTimeError); - iTabPanel.add(iFreeTimeTab, new HTML(MESSAGES.courseSelectionFreeTime(), false)); - iTabPanel.selectTab(0); - if (iAllowFreeTime) iDialogPanel.add(iTabPanel); ! else { iDialogPanel.add(iCoursesPanel); iDialogPanel.add(iCourseDetailsTabPanel); --- 419,431 ---- iFreeTimeTab.add(iFreeTimeError); if (iAllowFreeTime) + iTabPanel.add(iFreeTimeTab, MESSAGES.courseSelectionFreeTime(), true); + + if (ie) { iDialogPanel.add(iTabPanel); ! iDialogPanel.add(iCoursesTip); ! } else if (iAllowFreeTime) { ! iDialogPanel.add(iTabPanel); ! } else { iDialogPanel.add(iCoursesPanel); iDialogPanel.add(iCourseDetailsTabPanel); *************** *** 473,486 **** event.preventDefault(); } ! if (event.getNativeEvent().getCtrlKey() && (event.getNativeKeyCode()=='t' || event.getNativeKeyCode()=='T')) { ! iTabPanel.selectTab(1); event.preventDefault(); } if (event.getNativeEvent().getCtrlKey() && (event.getNativeKeyCode()=='d' || event.getNativeKeyCode()=='D')) { ! iCourseDetailsTabPanel.selectTab(0); event.preventDefault(); } if (event.getNativeEvent().getCtrlKey() && (event.getNativeKeyCode()=='l' || event.getNativeKeyCode()=='L')) { ! iCourseDetailsTabPanel.selectTab(1); event.preventDefault(); } --- 487,506 ---- event.preventDefault(); } ! if (iAllowFreeTime && event.getNativeEvent().getCtrlKey() && (event.getNativeKeyCode()=='t' || event.getNativeKeyCode()=='T')) { ! iTabPanel.selectTab(iCourseDetailsTabPanel == null ? 1 : 3); event.preventDefault(); } if (event.getNativeEvent().getCtrlKey() && (event.getNativeKeyCode()=='d' || event.getNativeKeyCode()=='D')) { ! if (iCourseDetailsTabPanel == null) ! iTabPanel.selectTab(1); ! else ! iCourseDetailsTabPanel.selectTab(0); event.preventDefault(); } if (event.getNativeEvent().getCtrlKey() && (event.getNativeKeyCode()=='l' || event.getNativeKeyCode()=='L')) { ! if (iCourseDetailsTabPanel == null) ! iTabPanel.selectTab(2); ! else ! iCourseDetailsTabPanel.selectTab(1); event.preventDefault(); } *************** *** 492,501 **** } }); - iCourseDetailsTabPanel.addSelectionHandler(new SelectionHandler<Integer>() { - public void onSelection(SelectionEvent<Integer> event) { - sLastSelectedCourseDetailsTab = event.getSelectedItem(); - } - }); - iCourses.addRowDoubleClickHandler(new WebTable.RowDoubleClickHandler() { public void onRowDoubleClick(RowDoubleClickEvent event) { --- 512,515 ---- *************** *** 541,553 **** iCoursesTip.setText(CONSTANTS.courseTips()[(int)(Math.random() * CONSTANTS.courseTips().length)]); iFreeTimeTip.setText(CONSTANTS.freeTimeTips()[(int)(Math.random() * CONSTANTS.freeTimeTips().length)]); ! iCourseDetailsTabPanel.selectTab(sLastSelectedCourseDetailsTab); iDialog.center(); Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { iFilter.setFocus(true); } }); - - updateCourses(); } --- 555,567 ---- iCoursesTip.setText(CONSTANTS.courseTips()[(int)(Math.random() * CONSTANTS.courseTips().length)]); iFreeTimeTip.setText(CONSTANTS.freeTimeTips()[(int)(Math.random() * CONSTANTS.freeTimeTips().length)]); ! if (iCourseDetailsTabPanel != null) ! iCourseDetailsTabPanel.selectTab(sLastSelectedCourseDetailsTab); iDialog.center(); Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { iFilter.setFocus(true); + updateCourses(); } }); } *************** *** 747,751 **** iFreeTimePicker.setFreeTime(parseFreeTime(iFilter.getText()), false); iFreeTimeError.setVisible(false); ! iTabPanel.selectTab(1); } catch (IllegalArgumentException e) { iFreeTimeError.setText(e.getMessage()); --- 761,765 ---- iFreeTimePicker.setFreeTime(parseFreeTime(iFilter.getText()), false); iFreeTimeError.setVisible(false); ! iTabPanel.selectTab(iTabPanel.getTabCount() - 1); } catch (IllegalArgumentException e) { iFreeTimeError.setText(e.getMessage()); *************** *** 762,779 **** WebTable.Row[] records = new WebTable.Row[result.size()]; int idx = 0; for (ClassAssignmentInterface.CourseAssignment record: result) { records[idx] = new WebTable.Row( record.getSubject(), record.getCourseNbr(), ! record.getTitle(), ! record.getNote()); records[idx].setId(record.hasUniqueName() ? "true" : "false"); ! if (result.size()==1 && iFilter.getText().equalsIgnoreCase(record.getSubject() + " " + record.getCourseNbr())) ! iTabPanel.selectTab(0); idx++; } iCourses.setData(records); ! if (records.length == 1) { ! iCourses.setSelectedRow(0); updateCourseDetails(); } --- 776,798 ---- WebTable.Row[] records = new WebTable.Row[result.size()]; int idx = 0; + int selectRow = -1; for (ClassAssignmentInterface.CourseAssignment record: result) { records[idx] = new WebTable.Row( record.getSubject(), record.getCourseNbr(), ! (record.getTitle() == null ? "" : record.getTitle()), ! (record.getNote() == null ? "" : record.getNote())); records[idx].setId(record.hasUniqueName() ? "true" : "false"); ! if (iFilter.getText().equalsIgnoreCase(record.getSubject() + " " + record.getCourseNbr())) ! selectRow = idx; idx++; } iCourses.setData(records); ! if (records.length == 1) ! selectRow = 0; ! if (selectRow >= 0) { ! iCourses.setSelectedRow(selectRow); ! if (iTabPanel.getSelectedTab() != 0) ! iTabPanel.selectTab(0); updateCourseDetails(); } Index: StudentSectioningWidget.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/sectioning/Attic/StudentSectioningWidget.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** StudentSectioningWidget.java 15 Nov 2010 15:15:44 -0000 1.1.2.4 --- StudentSectioningWidget.java 30 Nov 2010 18:54:08 -0000 1.1.2.5 *************** *** 225,235 **** iAssignmentPanel = new UniTimeTabPabel(); ! HTML tab0 = new HTML(MESSAGES.tabClasses(), false); ! iAssignmentPanel.add(iAssignments, tab0); iAssignmentPanel.selectTab(0); iAssignmentGrid = new TimeGrid(); ! HTML tab1 = new HTML(MESSAGES.tabTimetable(), false); ! iAssignmentPanel.add(iAssignmentGrid, tab1); iAssignmentPanel.addSelectionHandler(new SelectionHandler<Integer>() { public void onSelection(SelectionEvent<Integer> event) { --- 225,233 ---- iAssignmentPanel = new UniTimeTabPabel(); ! iAssignmentPanel.add(iAssignments, MESSAGES.tabClasses(), true); iAssignmentPanel.selectTab(0); iAssignmentGrid = new TimeGrid(); ! iAssignmentPanel.add(iAssignmentGrid, MESSAGES.tabTimetable(), true); iAssignmentPanel.addSelectionHandler(new SelectionHandler<Integer>() { public void onSelection(SelectionEvent<Integer> event) { Index: TimeGrid.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/sectioning/Attic/TimeGrid.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 *** TimeGrid.java 9 Nov 2010 12:25:52 -0000 1.1.2.3 --- TimeGrid.java 30 Nov 2010 18:54:08 -0000 1.1.2.4 *************** *** 35,39 **** import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.EventTarget; ! import com.google.gwt.dom.client.Style.VerticalAlign; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; --- 35,39 ---- import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.EventTarget; ! import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; *************** *** 378,383 **** ImageLink il = new ImageLink(new Image(RESOURCES.email()), "mailto:" + email); il.setTitle(MESSAGES.sendEmail(row.getInstructors().get(i))); - il.getElement().getStyle().setVerticalAlign(VerticalAlign.MIDDLE); il.setStyleName("A.unitime-SimpleLink"); instructors += DOM.toString(il.getElement()) + row.getInstructors().get(i) + (i + 1 < row.getInstructors().size() ? ", " : ""); } else { --- 378,383 ---- ImageLink il = new ImageLink(new Image(RESOURCES.email()), "mailto:" + email); il.setTitle(MESSAGES.sendEmail(row.getInstructors().get(i))); il.setStyleName("A.unitime-SimpleLink"); + il.getElement().getStyle().setMarginRight(1, Unit.PX); instructors += DOM.toString(il.getElement()) + row.getInstructors().get(i) + (i + 1 < row.getInstructors().size() ? ", " : ""); } else { |
Update of /cvsroot/unitime/UniTime/WebContent In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19166/WebContent Modified Files: Tag: dev_curriculum index.jsp gwt.jsp login.jsp logout.jsp main.jsp error.jsp loginRequired.jsp Log Message: Internet Exploder 8 (and 9) compatibility issues - all GWT pages are now showing the IE / chrome plug-in message - added IE-dependent style sheet - number of small tweaks in the styles for the GWT pages to look at least half decent in IE - course finder dialog (Scheduling Assistant, Edit Curriculum) - for some unknown reason IE has troubles with having two TabPanels and/or ScrollPanels in the dialog -> had to do it differently on IE - set IE rendering mechanism to IE=8 in a hope for some compatibility between different versions of IE - frame dialog moved to a separate class UniTimeFrameDialog - fixed IE notification when frame is loaded - page footer message style changed to better fit the page (smaller font, not-breakable lines, etc.) Index: logout.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/logout.jsp,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -C2 -d -r1.2.2.4 -r1.2.2.5 *** logout.jsp 9 Nov 2010 12:25:48 -0000 1.2.2.4 --- logout.jsp 30 Nov 2010 18:54:09 -0000 1.2.2.5 *************** *** 40,44 **** } </SCRIPT> ! <meta http-equiv="X-UA-Compatible" content="chrome=1"> </HEAD> <BODY onload="closeWin();"> --- 40,44 ---- } </SCRIPT> ! <meta http-equiv="X-UA-Compatible" content="IE=8,chrome=1"> </HEAD> <BODY onload="closeWin();"> Index: main.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/main.jsp,v retrieving revision 1.4.2.14 retrieving revision 1.4.2.15 diff -C2 -d -r1.4.2.14 -r1.4.2.15 *** main.jsp 29 Nov 2010 18:19:46 -0000 1.4.2.14 --- main.jsp 30 Nov 2010 18:54:09 -0000 1.4.2.15 *************** *** 34,38 **** <script language="JavaScript" type="text/javascript" src="scripts/loading.js"></script> <script type="text/javascript" language="javascript" src="unitime/unitime.nocache.js"></script> ! <meta http-equiv="X-UA-Compatible" content="chrome=1"> </head> <BODY class="unitime-Body"> --- 34,38 ---- <script language="JavaScript" type="text/javascript" src="scripts/loading.js"></script> <script type="text/javascript" language="javascript" src="unitime/unitime.nocache.js"></script> ! <meta http-equiv="X-UA-Compatible" content="IE=8,chrome=1"> </head> <BODY class="unitime-Body"> *************** *** 161,168 **** <table class="unitime-Footer" cellpadding="0" cellspacing="0"> <tr> ! <td width="33%" align="left" valign="top" nowrap="nowrap"><span id="UniTimeGWT:Version"></span></td> <!-- WARNING: Changing or removing the copyright notice will violate the license terms. If you need a different licensing, please contact us at su...@un... --> ! <td width="34%" align="center" valign="top"><tt:copy/></td> ! <td width="33%" align="right" valign="top"><tt:registration update="true"/></td> </tr> <tt:hasProperty name="tmtbl.page.disclaimer"> --- 161,168 ---- <table class="unitime-Footer" cellpadding="0" cellspacing="0"> <tr> ! <td width="33%" align="left" class="unitime-FooterText"><span id="UniTimeGWT:Version"></span></td> <!-- WARNING: Changing or removing the copyright notice will violate the license terms. If you need a different licensing, please contact us at su...@un... --> ! <td width="34%" align="center" class="unitime-FooterText"><tt:copy/></td> ! <td width="33%" align="right" class="unitime-FooterText"><tt:registration update="true"/></td> </tr> <tt:hasProperty name="tmtbl.page.disclaimer"> Index: login.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/login.jsp,v retrieving revision 1.5.2.9 retrieving revision 1.5.2.10 diff -C2 -d -r1.5.2.9 -r1.5.2.10 *** login.jsp 24 Nov 2010 17:31:55 -0000 1.5.2.9 --- login.jsp 30 Nov 2010 18:54:09 -0000 1.5.2.10 *************** *** 32,36 **** <script type="text/javascript" language="javascript" src="unitime/unitime.nocache.js"></script> <TITLE>UniTime 3.2| Log In</TITLE> ! <meta http-equiv="X-UA-Compatible" content="chrome=1"> </HEAD> <BODY class="bodyMain" onload="document.forms[0].username.focus();"> --- 32,36 ---- <script type="text/javascript" language="javascript" src="unitime/unitime.nocache.js"></script> <TITLE>UniTime 3.2| Log In</TITLE> ! <meta http-equiv="X-UA-Compatible" content="IE=8,chrome=1"> </HEAD> <BODY class="bodyMain" onload="document.forms[0].username.focus();"> *************** *** 118,122 **** <tr> <!-- WARNING: Changing or removing the copyright notice will violate the license terms. If you need a different licensing, please contact us at su...@un... --> ! <td align="center" nowrap="nowrap"><span id="UniTimeGWT:Version"></span><tt:copy/></td> </tr> <tt:hasProperty name="tmtbl.page.disclaimer"> --- 118,122 ---- <tr> <!-- WARNING: Changing or removing the copyright notice will violate the license terms. If you need a different licensing, please contact us at su...@un... --> ! <td align="center" class="unitime-FooterText"><span id="UniTimeGWT:Version"></span><tt:copy br="false"/></td> </tr> <tt:hasProperty name="tmtbl.page.disclaimer"> Index: gwt.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/Attic/gwt.jsp,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** gwt.jsp 24 Nov 2010 17:31:55 -0000 1.1.2.11 --- gwt.jsp 30 Nov 2010 18:54:09 -0000 1.1.2.12 *************** *** 24,27 **** --- 24,30 ---- <link type="text/css" rel="stylesheet" href="unitime/gwt/standard/standard.css"> <link type="text/css" rel="stylesheet" href="styles/unitime.css"> + <!--[if IE]> + <link type="text/css" rel="stylesheet" href="styles/unitime-ie.css"> + <![endif]--> <link rel="shortcut icon" href="images/timetabling.ico"> <title>UniTime 3.2| University Timetabling Application</title> *************** *** 42,45 **** --- 45,80 ---- </tt:propertyEquals> + <tt:hasProperty name="tmtbl.global.warn"> + <table width='100%' border='0' cellpadding='3' cellspacing='0'><tr><td class="unitime-MessageYellow" width='5'> </td><td class="unitime-MessageYellow" > + <tt:property name="tmtbl.global.warn"/> + </td></tr></table> + </tt:hasProperty> + + <!--[if IE]> + <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script> + + <table width='100%' border='0' cellpadding='3' cellspacing='0' style='display:none;' id='__ie_no_chrome'> + <tr><td class="unitime-MessageBlue" width='5'> </td> + <td class="unitime-MessageBlue"> + <a class='unitime-NoFancyLink' href="http://google.com/chromeframe">The UniTime application may run very slow in Internet Explorer. To speed it up, please click here and install Google Chrome Frame plug-in.</a></td> + </tr> + </table> + + <div style='display:none;'><div id='__ie_chrome_plugin'></div></div> + + <script> + function ie_no_chrome() { + document.getElementById('__ie_no_chrome').style.display = 'table'; + } + window.attachEvent("onload", function() { + CFInstall.check({ + mode: "inline", + node: "__ie_chrome_plugin", + onmissing: ie_no_chrome + }); + }); + </script> + <![endif]--> + <table align="center"> <tr> *************** *** 82,89 **** <table class="unitime-Footer"> <tr> ! <td width="33%" align="left" nowrap="nowrap" valign="top"><span id="UniTimeGWT:Version"></span></td> <!-- WARNING: Changing or removing the copyright notice will violate the license terms. If you need a different licensing, please contact us at su...@un... --> ! <td width="34%" align="center" valign="top" style="max-width: 300px;"><tt:copy/></td> ! <td width="33%" align="right" valign="top" style="max-width: 300px;"><tt:registration/></td> </tr> <tt:hasProperty name="tmtbl.page.disclaimer"> --- 117,124 ---- <table class="unitime-Footer"> <tr> ! <td width="33%" align="left" class="unitime-FooterText"><span id="UniTimeGWT:Version"></span></td> <!-- WARNING: Changing or removing the copyright notice will violate the license terms. If you need a different licensing, please contact us at su...@un... --> ! <td width="34%" align="center" class="unitime-FooterText"><tt:copy/></td> ! <td width="33%" align="right" class="unitime-FooterText"><tt:registration/></td> </tr> <tt:hasProperty name="tmtbl.page.disclaimer"> Index: loginRequired.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/loginRequired.jsp,v retrieving revision 1.7.2.6 retrieving revision 1.7.2.7 diff -C2 -d -r1.7.2.6 -r1.7.2.7 *** loginRequired.jsp 9 Nov 2010 12:25:48 -0000 1.7.2.6 --- loginRequired.jsp 30 Nov 2010 18:54:09 -0000 1.7.2.7 *************** *** 28,32 **** <LINK rel="stylesheet" type="text/css" href="styles/timetabling.css"> <link rel="shortcut icon" href="images/timetabling.ico" /> ! <meta http-equiv="X-UA-Compatible" content="chrome=1"> </HEAD> --- 28,32 ---- <LINK rel="stylesheet" type="text/css" href="styles/timetabling.css"> <link rel="shortcut icon" href="images/timetabling.ico" /> ! <meta http-equiv="X-UA-Compatible" content="IE=8,chrome=1"> </HEAD> Index: error.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/error.jsp,v retrieving revision 1.4.2.9 retrieving revision 1.4.2.10 diff -C2 -d -r1.4.2.9 -r1.4.2.10 *** error.jsp 24 Nov 2010 17:31:55 -0000 1.4.2.9 --- error.jsp 30 Nov 2010 18:54:09 -0000 1.4.2.10 *************** *** 50,54 **** <LINK rel="stylesheet" type="text/css" href="styles/timetabling.css" /> <script type="text/javascript" language="javascript" src="unitime/unitime.nocache.js"></script> ! <meta http-equiv="X-UA-Compatible" content="chrome=1"> </HEAD> <BODY class="bodyMain"> --- 50,54 ---- <LINK rel="stylesheet" type="text/css" href="styles/timetabling.css" /> <script type="text/javascript" language="javascript" src="unitime/unitime.nocache.js"></script> ! <meta http-equiv="X-UA-Compatible" content="IE=8,chrome=1"> </HEAD> <BODY class="bodyMain"> Index: index.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/index.jsp,v retrieving revision 1.3.2.5 retrieving revision 1.3.2.6 diff -C2 -d -r1.3.2.5 -r1.3.2.6 *** index.jsp 9 Nov 2010 12:25:48 -0000 1.3.2.5 --- index.jsp 30 Nov 2010 18:54:09 -0000 1.3.2.6 *************** *** 31,35 **** <link rel="shortcut icon" href="images/timetabling.ico" /> <TITLE>UniTime 3.2| University Timetabling Application</TITLE> ! <meta http-equiv="X-UA-Compatible" content="chrome=1"> </HEAD> <BODY> --- 31,35 ---- <link rel="shortcut icon" href="images/timetabling.ico" /> <TITLE>UniTime 3.2| University Timetabling Application</TITLE> ! <meta http-equiv="X-UA-Compatible" content="IE=8,chrome=1"> </HEAD> <BODY> |
|
From: Tomas M. <to...@us...> - 2010-11-30 18:54:17
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/curricula In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19166/JavaSource/org/unitime/timetable/gwt/client/curricula Modified Files: Tag: dev_curriculum CurriculaCourseSelectionBox.java Log Message: Internet Exploder 8 (and 9) compatibility issues - all GWT pages are now showing the IE / chrome plug-in message - added IE-dependent style sheet - number of small tweaks in the styles for the GWT pages to look at least half decent in IE - course finder dialog (Scheduling Assistant, Edit Curriculum) - for some unknown reason IE has troubles with having two TabPanels and/or ScrollPanels in the dialog -> had to do it differently on IE - set IE rendering mechanism to IE=8 in a hope for some compatibility between different versions of IE - frame dialog moved to a separate class UniTimeFrameDialog - fixed IE notification when frame is loaded - page footer message style changed to better fit the page (smaller font, not-breakable lines, etc.) Index: CurriculaCourseSelectionBox.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/client/curricula/Attic/CurriculaCourseSelectionBox.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** CurriculaCourseSelectionBox.java 9 Nov 2010 12:25:51 -0000 1.1.2.4 --- CurriculaCourseSelectionBox.java 30 Nov 2010 18:54:09 -0000 1.1.2.5 *************** *** 65,68 **** --- 65,69 ---- import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.user.client.Timer; + import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Composite; *************** *** 249,253 **** --- 250,256 ---- private void openDialog() { + final boolean ie = "Microsoft Internet Explorer".equals(Window.Navigator.getAppName()); if (iDialog == null) { + iDialog = new UniTimeDialogBox(true, true); iDialog.setText(MESSAGES.courseSelectionDialog()); *************** *** 298,302 **** iCoursesPanel = new ScrollPanel(iCourses); ! iCoursesPanel.setSize("780", "200"); iCoursesPanel.setStyleName("unitime-ScrollPanel"); --- 301,305 ---- iCoursesPanel = new ScrollPanel(iCourses); ! iCoursesPanel.setSize("780px", "200px"); iCoursesPanel.setStyleName("unitime-ScrollPanel"); *************** *** 306,310 **** iCourseDetailsPanel = new ScrollPanel(iCourseDetails); iCourseDetailsPanel.setStyleName("unitime-ScrollPanel-inner"); ! iCourseDetailsTabPanel.add(iCourseDetailsPanel, new HTML(MESSAGES.courseSelectionDetails())); iClasses = new WebTable(); --- 309,313 ---- iCourseDetailsPanel = new ScrollPanel(iCourseDetails); iCourseDetailsPanel.setStyleName("unitime-ScrollPanel-inner"); ! iCourseDetailsTabPanel.add(iCourseDetailsPanel, MESSAGES.courseSelectionDetails(), true); iClasses = new WebTable(); *************** *** 325,329 **** iClassesPanel = new ScrollPanel(iClasses); iClassesPanel.setStyleName("unitime-ScrollPanel-inner"); ! iCourseDetailsTabPanel.add(iClassesPanel, new HTML("C<u>l</u>asses", false)); iCurricula = new CourseCurriculaTable(false, false); --- 328,332 ---- iClassesPanel = new ScrollPanel(iClasses); iClassesPanel.setStyleName("unitime-ScrollPanel-inner"); ! iCourseDetailsTabPanel.add(iClassesPanel, "C<u>l</u>asses", true); iCurricula = new CourseCurriculaTable(false, false); *************** *** 331,341 **** iCurriculaPanel = new ScrollPanel(iCurricula); iCurriculaPanel.setStyleName("unitime-ScrollPanel-inner"); ! iCourseDetailsTabPanel.add(iCurriculaPanel, new HTML("<u>C</u>urricula", false)); ! ! iCourseDetailsTabPanel.setDeckSize("780", "200"); ! iCourseDetailsTabPanel.setDeckStyleName("unitime-TabPanel"); ! ! iCourseDetailsTabPanel.selectTab(sLastSelectedCourseDetailsTab); ! iCoursesTip = new Label(CONSTANTS.courseTips()[(int)(Math.random() * CONSTANTS.courseTips().length)]); iCoursesTip.setStyleName("unitime-Hint"); --- 334,339 ---- iCurriculaPanel = new ScrollPanel(iCurricula); iCurriculaPanel.setStyleName("unitime-ScrollPanel-inner"); ! iCourseDetailsTabPanel.add(iCurriculaPanel, (ie ? "Cu<u>r</u>ricula" : "<u>C</u>urricula"), true); ! iCoursesTip = new Label(CONSTANTS.courseTips()[(int)(Math.random() * CONSTANTS.courseTips().length)]); iCoursesTip.setStyleName("unitime-Hint"); *************** *** 350,354 **** }); ! iDialogPanel.add(iCoursesPanel); iDialogPanel.add(iCourseDetailsTabPanel); iDialogPanel.add(iCoursesTip); --- 348,363 ---- }); ! if (ie) { ! iCoursesPanel.setSize("780px", "400px"); ! iCourseDetailsPanel.setSize("780px", "400px"); ! iClassesPanel.setSize("780px", "400px"); ! iCurriculaPanel.setSize("780px", "400px"); ! iCoursesPanel.setStyleName("unitime-ScrollPanel-inner"); ! iCourseDetailsTabPanel.insert(iCoursesPanel, MESSAGES.courseSelectionCourses(), true, 0); ! } else { ! iCourseDetailsTabPanel.setDeckSize("780", "200"); ! iCourseDetailsTabPanel.setDeckStyleName("unitime-TabPanel"); ! iDialogPanel.add(iCoursesPanel); ! } iDialogPanel.add(iCourseDetailsTabPanel); iDialogPanel.add(iCoursesTip); *************** *** 396,409 **** updateCourseDetails(); } if (event.getNativeEvent().getCtrlKey() && (event.getNativeKeyCode()=='d' || event.getNativeKeyCode()=='D')) { ! iCourseDetailsTabPanel.selectTab(0); event.preventDefault(); } if (event.getNativeEvent().getCtrlKey() && (event.getNativeKeyCode()=='l' || event.getNativeKeyCode()=='L')) { ! iCourseDetailsTabPanel.selectTab(1); event.preventDefault(); } ! if (event.getNativeEvent().getCtrlKey() && (event.getNativeKeyCode()=='c' || event.getNativeKeyCode()=='C')) { ! iCourseDetailsTabPanel.selectTab(2); event.preventDefault(); } --- 405,422 ---- updateCourseDetails(); } + if (event.getNativeEvent().getCtrlKey() && (event.getNativeKeyCode()=='c' || event.getNativeKeyCode()=='C')) { + iCourseDetailsTabPanel.selectTab(ie ? 0 : 2); + event.preventDefault(); + } if (event.getNativeEvent().getCtrlKey() && (event.getNativeKeyCode()=='d' || event.getNativeKeyCode()=='D')) { ! iCourseDetailsTabPanel.selectTab(ie ? 1 : 0); event.preventDefault(); } if (event.getNativeEvent().getCtrlKey() && (event.getNativeKeyCode()=='l' || event.getNativeKeyCode()=='L')) { ! iCourseDetailsTabPanel.selectTab(ie ? 2 : 1); event.preventDefault(); } ! if (ie && event.getNativeEvent().getCtrlKey() && (event.getNativeKeyCode()=='r' || event.getNativeKeyCode()=='R')) { ! iCourseDetailsTabPanel.selectTab(3); event.preventDefault(); } *************** *** 585,588 **** --- 598,602 ---- int idx = 0; boolean hasProj = false, hasEnrl = false, hasLastLike = false; + int selectRow = -1; for (ClassAssignmentInterface.CourseAssignment record: result) { records[idx] = new WebTable.Row( *************** *** 598,601 **** --- 612,617 ---- if (!hasLastLike && !record.getLastLikeString().isEmpty()) hasLastLike = true; records[idx].setId(record.getCourseId().toString()); + if (iFilter.getText().equalsIgnoreCase(record.getSubject() + " " + record.getCourseNbr())) + selectRow = idx; idx++; } *************** *** 604,609 **** iCourses.setColumnVisible(6, hasEnrl); iCourses.setColumnVisible(7, hasLastLike); ! if (records.length == 1) { ! iCourses.setSelectedRow(0); updateCourseDetails(); } --- 620,626 ---- iCourses.setColumnVisible(6, hasEnrl); iCourses.setColumnVisible(7, hasLastLike); ! if (records.length == 1) selectRow = 0; ! if (selectRow >= 0) { ! iCourses.setSelectedRow(selectRow); updateCourseDetails(); } |
|
From: Tomas M. <to...@us...> - 2010-11-30 18:54:17
|
Update of /cvsroot/unitime/UniTime/WebContent/styles In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19166/WebContent/styles Modified Files: Tag: dev_curriculum unitime.css Added Files: Tag: dev_curriculum unitime-ie.css Log Message: Internet Exploder 8 (and 9) compatibility issues - all GWT pages are now showing the IE / chrome plug-in message - added IE-dependent style sheet - number of small tweaks in the styles for the GWT pages to look at least half decent in IE - course finder dialog (Scheduling Assistant, Edit Curriculum) - for some unknown reason IE has troubles with having two TabPanels and/or ScrollPanels in the dialog -> had to do it differently on IE - set IE rendering mechanism to IE=8 in a hope for some compatibility between different versions of IE - frame dialog moved to a separate class UniTimeFrameDialog - fixed IE notification when frame is loaded - page footer message style changed to better fit the page (smaller font, not-breakable lines, etc.) Index: unitime.css =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/styles/Attic/unitime.css,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -C2 -d -r1.1.2.15 -r1.1.2.16 *** unitime.css 29 Nov 2010 18:20:48 -0000 1.1.2.15 --- unitime.css 30 Nov 2010 18:54:09 -0000 1.1.2.16 *************** *** 46,56 **** .unitime-Footer { ! font-size: x-small; ! text-align: right; vertical-align: top; font-style: italic; color: #9CB0CE; ! width: 100%; ! margin-top: -5px; } --- 46,59 ---- .unitime-Footer { ! width: 100%; ! margin-top: -6px; ! } ! ! .unitime-FooterText { ! font-size: 9pt; vertical-align: top; font-style: italic; color: #9CB0CE; ! white-space: nowrap; } *************** *** 82,87 **** --- 85,98 ---- text-decoration: none; background-color : transparent; + vertical-align: middle; } + A.unitime-NoFancyLink:link,A.unitime-NoFancyLink:visited,A.unitime-NoFancyLink:active,A.unitime-NoFancyLink:hover { + color: black; + text-decoration: none; + background-color : transparent; + } + + h1 { font-size: 2em; *************** *** 328,332 **** .unitime-TextBoxHint { font-family: Verdana, sans-serif; ! font-size: 6pt; font-weight: 400; font-style: normal; --- 339,343 ---- .unitime-TextBoxHint { font-family: Verdana, sans-serif; ! font-size: xx-small; font-weight: 400; font-style: normal; *************** *** 1248,1250 **** --- 1259,1273 ---- background: transparent url(../images/dialog-close.png) center center no-repeat; -background: transparent url(../images/dialog-close.gif) center center no-repeat; + } + + .unitime-MessageBlue { + color: black; + background: #DFE7F2; + border-bottom: 1px black solid; + } + + .unitime-MessageYellow { + color: black; + background: #fcdd89; + border-bottom: 1px black solid; } \ No newline at end of file --- NEW FILE: unitime-ie.css --- /* * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * */ .unitime-TextBoxHint { margin-top: -1px; } .gwt-SuggestBox { margin-top: -1px; } .unitime-TimeGrid .meeting .footer { font-size: 9pt; line-height: 12px; } |
|
From: Tomas M. <to...@us...> - 2010-11-30 18:54:17
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/resources/icons In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19166/JavaSource/org/unitime/timetable/gwt/resources/icons Modified Files: Tag: dev_curriculum letter.png Log Message: Internet Exploder 8 (and 9) compatibility issues - all GWT pages are now showing the IE / chrome plug-in message - added IE-dependent style sheet - number of small tweaks in the styles for the GWT pages to look at least half decent in IE - course finder dialog (Scheduling Assistant, Edit Curriculum) - for some unknown reason IE has troubles with having two TabPanels and/or ScrollPanels in the dialog -> had to do it differently on IE - set IE rendering mechanism to IE=8 in a hope for some compatibility between different versions of IE - frame dialog moved to a separate class UniTimeFrameDialog - fixed IE notification when frame is loaded - page footer message style changed to better fit the page (smaller font, not-breakable lines, etc.) Index: letter.png =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/resources/icons/Attic/letter.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsio7WLl and /tmp/cvsb5tIF9 differ |
|
From: Tomas M. <to...@us...> - 2010-11-30 18:50:00
|
Update of /cvsroot/unitime/UniTime In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17841 Modified Files: Tag: dev_curriculum build.xml Log Message: Added ojdbc5.jar and ojdbc14.jar in the class-path of the remote solver server (so any Oracle JDBC driver downloaded should work). Index: build.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/build.xml,v retrieving revision 1.16.2.16 retrieving revision 1.16.2.17 diff -C2 -d -r1.16.2.16 -r1.16.2.17 *** build.xml 17 Nov 2010 15:09:52 -0000 1.16.2.16 --- build.xml 30 Nov 2010 18:49:53 -0000 1.16.2.17 *************** *** 119,123 **** <manifest> <attribute name="Main-Class" value="org.unitime.timetable.solver.remote.core.Startup" /> ! <attribute name="Class-Path" value="antlr-2.7.6.jar backport-util-concurrent.jar commons-collections-3.2.1.jar commons-dbcp-1.4.jar commons-logging-1.1.1.jar commons-pool-1.5.4.jar cpsolver-all-1.2.jar dom4j-1.6.1.jar ehcache-1.5.0.jar hibernate3.jar javassist-3.9.0.GA.jar jta-1.1.jar log4j-1.2.15.jar mysql-connector-java-5.1.11-bin.jar ojdbc6.jar slf4j-api-1.5.8.jar slf4j-log4j12-1.5.8.jar jsp-api.jar servlet-api.jar" /> <attribute name="Timetabling-Version" value="3.2_bld${build.number}"/> </manifest> --- 119,123 ---- <manifest> <attribute name="Main-Class" value="org.unitime.timetable.solver.remote.core.Startup" /> ! <attribute name="Class-Path" value="antlr-2.7.6.jar backport-util-concurrent.jar commons-collections-3.2.1.jar commons-dbcp-1.4.jar commons-logging-1.1.1.jar commons-pool-1.5.4.jar cpsolver-all-1.2.jar dom4j-1.6.1.jar ehcache-1.5.0.jar hibernate3.jar javassist-3.9.0.GA.jar jta-1.1.jar log4j-1.2.15.jar mysql-connector-java-5.1.11-bin.jar ojdbc6.jar ojdbc5.jar ojdbc14.jar slf4j-api-1.5.8.jar slf4j-log4j12-1.5.8.jar jsp-api.jar servlet-api.jar" /> <attribute name="Timetabling-Version" value="3.2_bld${build.number}"/> </manifest> *************** *** 315,319 **** <include name="commons-pool-1.5.4.jar"/> <!-- Connection pool required dependency --> <include name="mysql-connector-java-5.1.11-bin.jar"/> <!-- MySQL connector classes --> - <include name="ojdbc6.jar"/> <!-- Oracle connector classes --> <include name="commons-logging-1.1.1.jar"/> <!-- UniTime Logging --> <include name="slf4j-api-1.5.8.jar"/> <!-- Hibernate Logging --> --- 315,318 ---- *************** *** 355,359 **** <include name="commons-pool-1.5.4.jar"/> <!-- Connection pool required dependency --> <include name="mysql-connector-java-5.1.11-bin.jar"/> <!-- MySQL connector classes --> - <include name="ojdbc6.jar"/> <!-- Oracle connector classes --> <include name="commons-logging-1.1.1.jar"/> <!-- UniTime Logging --> <include name="slf4j-api-1.5.8.jar"/> <!-- Hibernate Logging --> --- 354,357 ---- |
|
From: Stephanie S. <say...@us...> - 2010-11-30 15:30:48
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/dataexchange In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv14790/JavaSource/org/unitime/banner/dataexchange Modified Files: Tag: dev_curriculum BannerStudentDataUpdate.java Log Message: Added update of class enrollment counts and course offering enrollment counts. Index: BannerStudentDataUpdate.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/dataexchange/Attic/BannerStudentDataUpdate.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 *** BannerStudentDataUpdate.java 8 Nov 2010 18:57:10 -0000 1.1.2.1 --- BannerStudentDataUpdate.java 30 Nov 2010 15:30:40 -0000 1.1.2.2 *************** *** 21,24 **** --- 21,25 ---- package org.unitime.banner.dataexchange; + import java.util.ArrayList; import java.util.Date; import java.util.HashMap; *************** *** 26,29 **** --- 27,32 ---- import java.util.Hashtable; import java.util.Iterator; + import java.util.List; + import java.util.Set; import java.util.Vector; *************** *** 62,65 **** --- 65,70 ---- private HashSet<String> studentIdsSucessfullyProcessedWithProblems = new HashSet<String>(); + private HashSet<Long> classIdsTouched = new HashSet<Long>(); + private HashSet<Long> courseIdsTouched = new HashSet<Long>(); private boolean trimLeadingZerosFromExternalId; *************** *** 106,109 **** --- 111,121 ---- } beginTransaction(); + info("Updating class enrollments."); + updateEnrollmentForClassIds(); + info("Updating course offering enrollments."); + updateCourseOfferingEnrollmentCounts(); + info("Done updating enrollments."); + commitTransaction(); + beginTransaction(); int studentCount = 0; for(Session session : studentIdsSucessfullyProcessed.keySet()){ *************** *** 142,145 **** --- 154,158 ---- } + private void processStudentElement(Element studentElement) { String externalId = null; *************** *** 245,248 **** --- 258,267 ---- for(Student student : studentRecords){ addSessionRecordToList(recordsProcessed, student.getSession(), student.getUniqueId()); + if (student.getClassEnrollments() != null && student.getClassEnrollments().size() > 0){ + for(StudentClassEnrollment sce : student.getClassEnrollments()){ + classIdsTouched.add(sce.getClazz().getUniqueId()); + courseIdsTouched.add(sce.getCourseOffering().getUniqueId()); + } + } getHibSession().delete(student); } *************** *** 381,388 **** --- 400,411 ---- record.getClassEnrollments().add(enrollment); changed = true; + classIdsTouched.add(clazz.getUniqueId()); + courseIdsTouched.add(co.getUniqueId()); } } if (!enrollments.isEmpty()) { for (StudentClassEnrollment enrollment: enrollments.values()) { + classIdsTouched.add(enrollment.getClazz().getUniqueId()); + courseIdsTouched.add(enrollment.getCourseOffering().getUniqueId()); record.getClassEnrollments().remove(enrollment); getHibSession().delete(enrollment); *************** *** 402,405 **** --- 425,432 ---- for(Student student : records){ addSessionRecordToList(recordsProcessed, student.getSession(), student.getUniqueId()); + for(StudentClassEnrollment sce : student.getClassEnrollments()){ + classIdsTouched.add(sce.getClazz().getUniqueId()); + courseIdsTouched.add(sce.getCourseOffering().getUniqueId()); + } getHibSession().delete(student); } *************** *** 476,478 **** --- 503,560 ---- } + private void updateEnrollmentForClassIds(){ + String ids = ""; + int count = 0; + for (Long id: classIdsTouched) { + if (count > 0) ids += ","; + ids += id; + count ++; + if (count == 1000) { + getHibSession().createQuery("update Class_ c " + + "set c.enrollment=(select count(distinct d.student) " + + " from StudentClassEnrollment d " + + " where d.clazz.uniqueId =c.uniqueId) " + + " where c.uniqueId in (" + ids + ")").executeUpdate(); + ids = ""; count = 0; + } + } + if (count > 0) { + getHibSession().createQuery("update Class_ c " + + "set c.enrollment=(select count(distinct d.student) " + + " from StudentClassEnrollment d " + + " where d.clazz.uniqueId =c.uniqueId) " + + " where c.uniqueId in (" + ids + ")").executeUpdate(); + } + + } + + private void updateCourseOfferingEnrollmentCounts() { + + String ids = ""; + int count = 0; + for (Long id: courseIdsTouched) { + if (count > 0) ids += ","; + ids += id; + count ++; + if (count == 1000) { + getHibSession().createQuery("update CourseOffering c " + + "set c.enrollment=(select count(distinct d.student) " + + " from StudentClassEnrollment d " + + " where d.courseOffering.uniqueId =c.uniqueId) " + + " where c.uniqueId in (" + ids + ")").executeUpdate(); + ids = ""; count = 0; + } + } + if (count > 0) { + getHibSession().createQuery("update CourseOffering c " + + "set c.enrollment=(select count(distinct d.student) " + + " from StudentClassEnrollment d " + + " where d.courseOffering.uniqueId =c.uniqueId) " + + " where c.uniqueId in (" + ids + ")").executeUpdate(); + } + + + } + + } |
|
From: Stephanie S. <say...@us...> - 2010-11-30 15:30:33
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/dataexchange In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv14695/JavaSource/org/unitime/banner/dataexchange Modified Files: Tag: dev_curriculum BannerStudentEnrollmentMessage.java Log Message: Added update of class enrollment counts and course offering enrollment counts. Index: BannerStudentEnrollmentMessage.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/dataexchange/BannerStudentEnrollmentMessage.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** BannerStudentEnrollmentMessage.java 3 Sep 2010 18:33:59 -0000 1.1.2.2 --- BannerStudentEnrollmentMessage.java 30 Nov 2010 15:30:25 -0000 1.1.2.3 *************** *** 20,23 **** --- 20,24 ---- package org.unitime.banner.dataexchange; + import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; *************** *** 27,32 **** import java.util.Vector; - import net.sf.cpsolver.ifs.util.HashSet; - import org.dom4j.Element; import org.unitime.banner.model.BannerSection; --- 28,31 ---- |
|
From: Nightly B. <no...@un...> - 2010-11-29 23:51:25
|
Download the resultant file at http://www.unitime.org/uct_builds.php, see the attached build and change logs for more details. |
|
From: Tomas M. <to...@us...> - 2010-11-29 23:30:09
|
Update of /cvsroot/unitime/UniTime/WebContent/WEB-INF In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8307/WebContent/WEB-INF Modified Files: Tag: dev_curriculum web.xml Log Message: Query Log - exclude GWT request MenuService#getSolverInfo (update solver status) from the logging as it can generate a lot of traffic Index: web.xml =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/WEB-INF/web.xml,v retrieving revision 1.5.2.12 retrieving revision 1.5.2.13 diff -C2 -d -r1.5.2.12 -r1.5.2.13 *** web.xml 23 Nov 2010 19:11:45 -0000 1.5.2.12 --- web.xml 29 Nov 2010 22:11:12 -0000 1.5.2.13 *************** *** 229,232 **** --- 229,236 ---- org.unitime.timetable.filter.QueryLogFilter </filter-class> + <init-param> + <param-name>exclude</param-name> + <param-value>menu.gwt: MenuService#getSolverInfo</param-value> + </init-param> </filter> *************** *** 260,272 **** <filter-name>Query Log Filter</filter-name> <url-pattern>*.do</url-pattern> ! </filter-mapping> ! ! <filter-mapping> ! <filter-name>Query Log Filter</filter-name> ! <url-pattern>*.gwt</url-pattern> ! </filter-mapping> ! ! <filter-mapping> ! <filter-name>Query Log Filter</filter-name> <url-pattern>/calendar</url-pattern> </filter-mapping> --- 264,268 ---- <filter-name>Query Log Filter</filter-name> <url-pattern>*.do</url-pattern> ! <url-pattern>*.gwt</url-pattern> <url-pattern>/calendar</url-pattern> </filter-mapping> |
|
From: Tomas M. <to...@us...> - 2010-11-29 22:11:20
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/filter In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8307/JavaSource/org/unitime/timetable/filter Modified Files: Tag: dev_curriculum QueryLogFilter.java Log Message: Query Log - exclude GWT request MenuService#getSolverInfo (update solver status) from the logging as it can generate a lot of traffic Index: QueryLogFilter.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/filter/Attic/QueryLogFilter.java,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** QueryLogFilter.java 23 Nov 2010 18:54:25 -0000 1.1.2.6 --- QueryLogFilter.java 29 Nov 2010 22:11:12 -0000 1.1.2.7 *************** *** 29,32 **** --- 29,33 ---- import java.util.Date; import java.util.Enumeration; + import java.util.HashSet; import java.util.List; import java.util.Locale; *************** *** 61,64 **** --- 62,66 ---- private boolean iActive = false; private Saver iSaver; + private HashSet<String> iExclude = new HashSet<String>(); public void init(FilterConfig cfg) throws ServletException { *************** *** 66,69 **** --- 68,76 ---- Saver iSaver = new Saver(); iSaver.start(); + String exclude = cfg.getInitParameter("exclude"); + if (exclude != null) { + for (String x: exclude.split(",")) + iExclude.add(x); + } } *************** *** 158,162 **** q.setException(ex); } ! synchronized (iQueries) { iQueries.add(q); } } --- 165,171 ---- q.setException(ex); } ! if (!iExclude.contains(q.getUri()) || q.getException() != null) { ! synchronized (iQueries) { iQueries.add(q); } ! } } |
|
From: Tomas M. <to...@us...> - 2010-11-29 18:20:56
|
Update of /cvsroot/unitime/UniTime/WebContent/styles In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv6478/WebContent/styles Modified Files: Tag: dev_curriculum unitime.css Log Message: Shifted the page footnote 1 pixel down (looks much better in IE -- as it tended to hide the top line of the text) Index: unitime.css =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/styles/Attic/unitime.css,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -C2 -d -r1.1.2.14 -r1.1.2.15 *** unitime.css 9 Nov 2010 12:25:51 -0000 1.1.2.14 --- unitime.css 29 Nov 2010 18:20:48 -0000 1.1.2.15 *************** *** 52,56 **** color: #9CB0CE; width: 100%; ! margin-top: -6px; } --- 52,56 ---- color: #9CB0CE; width: 100%; ! margin-top: -5px; } |
|
From: Tomas M. <to...@us...> - 2010-11-29 18:19:56
|
Update of /cvsroot/unitime/UniTime/WebContent In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5989/WebContent Modified Files: Tag: dev_curriculum main.jsp Log Message: Main page - display the IE message (about using the Chrome plugin) below the menu (not under or above it) - fix the with of the page to 900 px (IE tends to make the page wide and ugly, and does not seem to understand max-width style) Index: main.jsp =================================================================== RCS file: /cvsroot/unitime/UniTime/WebContent/main.jsp,v retrieving revision 1.4.2.13 retrieving revision 1.4.2.14 diff -C2 -d -r1.4.2.13 -r1.4.2.14 *** main.jsp 24 Nov 2010 17:31:55 -0000 1.4.2.13 --- main.jsp 29 Nov 2010 18:19:46 -0000 1.4.2.14 *************** *** 38,42 **** <BODY class="unitime-Body"> ! <!--[if IE]> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script> --- 38,61 ---- <BODY class="unitime-Body"> ! <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex="-1" style="position:absolute;width:0;height:0;border:0"></iframe> ! <iframe src="javascript:''" id="__printingFrame" tabIndex="-1" style="position:absolute;width:0;height:0;border:0"></iframe> ! ! <tt:notHasProperty name="unitime.menu.style" user="true"> ! <span id='UniTimeGWT:DynamicTopMenu' style="display: none;" ></span> ! </tt:notHasProperty> ! <tt:propertyEquals name="unitime.menu.style" user="true" value="Dynamic On Top"> ! <span id='UniTimeGWT:DynamicTopMenu' style="display: none;" ></span> ! </tt:propertyEquals> ! <tt:propertyEquals name="unitime.menu.style" user="true" value="Static On Top"> ! <span id='UniTimeGWT:TopMenu' style="display: none;" ></span> ! </tt:propertyEquals> ! ! <tt:hasProperty name="tmtbl.global.warn"> ! <table width='100%' border='0' cellpadding='3' cellspacing='0'><tr><td class="reqGlobalWarn" width='5'> </td><td class="reqGlobalWarn" > ! <tt:property name="tmtbl.global.warn"/> ! </td></tr></table> ! </tt:hasProperty> ! ! <!--[if IE]> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script> *************** *** 52,56 **** <script> function ie_no_chrome() { ! document.getElementById('__ie_no_chrome').style.display = 'block'; } window.attachEvent("onload", function() { --- 71,75 ---- <script> function ie_no_chrome() { ! document.getElementById('__ie_no_chrome').style.display = 'table'; } window.attachEvent("onload", function() { *************** *** 62,88 **** }); </script> ! <![endif]--> ! ! <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex="-1" style="position:absolute;width:0;height:0;border:0"></iframe> ! <iframe src="javascript:''" id="__printingFrame" tabIndex="-1" style="position:absolute;width:0;height:0;border:0"></iframe> ! ! <tt:notHasProperty name="unitime.menu.style" user="true"> ! <span id='UniTimeGWT:DynamicTopMenu' style="display: none;" ></span> ! </tt:notHasProperty> ! <tt:propertyEquals name="unitime.menu.style" user="true" value="Dynamic On Top"> ! <span id='UniTimeGWT:DynamicTopMenu' style="display: none;" ></span> ! </tt:propertyEquals> ! <tt:propertyEquals name="unitime.menu.style" user="true" value="Static On Top"> ! <span id='UniTimeGWT:TopMenu' style="display: none;" ></span> ! </tt:propertyEquals> ! ! <tt:hasProperty name="tmtbl.global.warn"> ! <table width='100%' border='0' cellpadding='3' cellspacing='0'><tr><td class="reqGlobalWarn" width='5'> </td><td class="reqGlobalWarn" > ! <tt:property name="tmtbl.global.warn"/> ! </td></tr></table> ! </tt:hasProperty> <div id="contentMain"> ! <table align="center"> <tr> <td valign="top" rowspan="2"> --- 81,88 ---- }); </script> ! <![endif]--> <div id="contentMain"> ! <table align="center" width="900px"> <tr> <td valign="top" rowspan="2"> *************** *** 110,114 **** </table> </td></tr><tr><td> ! <TABLE width="800px" height="600px" align="center"> <TR> <% --- 110,114 ---- </table> </td></tr><tr><td> ! <TABLE width="100%" height="600px" align="center" > <TR> <% *************** *** 159,173 **** </td></tr></table> </td></tr><tr><td valign="top"> ! <table class="unitime-Footer" style="max-width: 800px;" cellpadding="0" cellspacing="0"> <tr> <td width="33%" align="left" valign="top" nowrap="nowrap"><span id="UniTimeGWT:Version"></span></td> <!-- WARNING: Changing or removing the copyright notice will violate the license terms. If you need a different licensing, please contact us at su...@un... --> ! <td width="34%" align="center" valign="top" style="max-width: 300px;"><tt:copy/></td> ! <td width="33%" align="right" valign="top" style="max-width: 300px;"><tt:registration update="true"/></td> ! </tr> ! <tr> ! <td colspan='3' align='center'> ! ! </td> </tr> <tt:hasProperty name="tmtbl.page.disclaimer"> --- 159,168 ---- </td></tr></table> </td></tr><tr><td valign="top"> ! <table class="unitime-Footer" cellpadding="0" cellspacing="0"> <tr> <td width="33%" align="left" valign="top" nowrap="nowrap"><span id="UniTimeGWT:Version"></span></td> <!-- WARNING: Changing or removing the copyright notice will violate the license terms. If you need a different licensing, please contact us at su...@un... --> ! <td width="34%" align="center" valign="top"><tt:copy/></td> ! <td width="33%" align="right" valign="top"><tt:registration update="true"/></td> </tr> <tt:hasProperty name="tmtbl.page.disclaimer"> |
|
From: Tomas M. <to...@us...> - 2010-11-29 18:17:15
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/webutil/timegrid In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5523/JavaSource/org/unitime/timetable/webutil/timegrid Modified Files: Tag: dev_curriculum SolutionGridModel.java TimetableGridCell.java Log Message: Timetable page - when displaying save solution, display dates instead of extended date pattern names - the rest of the logic is the same (default date pattern is not displayed, other (not extended) date patterns are displayed as date pattern name) Index: SolutionGridModel.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/webutil/timegrid/SolutionGridModel.java,v retrieving revision 1.5.2.6 retrieving revision 1.5.2.7 diff -C2 -d -r1.5.2.6 -r1.5.2.7 *** SolutionGridModel.java 9 Nov 2010 12:25:50 -0000 1.5.2.6 --- SolutionGridModel.java 29 Nov 2010 18:17:07 -0000 1.5.2.7 *************** *** 318,323 **** if (cell==null) cell = createCell(j,start,hibSession, assignment, bgMode); ! else cell = cell.copyCell(j,cell.getMeetingNumber()+1); addCell(j,start,cell); } --- 318,325 ---- if (cell==null) cell = createCell(j,start,hibSession, assignment, bgMode); ! else { cell = cell.copyCell(j,cell.getMeetingNumber()+1); + cell.setDays(TimetableGridCell.formatDatePattern(assignment.getDatePattern(), Constants.DAY_CODES[j])); + } addCell(j,start,cell); } *************** *** 490,494 **** 0, nrMeetings, ! assignment.getDatePattern().getName(), assignment.getDatePattern().getPatternBitSet(), instructors); --- 492,496 ---- 0, nrMeetings, ! TimetableGridCell.formatDatePattern(assignment.getDatePattern(), Constants.DAY_CODES[day]), assignment.getDatePattern().getPatternBitSet(), instructors); Index: TimetableGridCell.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/webutil/timegrid/TimetableGridCell.java,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -d -r1.5.2.3 -r1.5.2.4 *** TimetableGridCell.java 9 Nov 2010 12:25:50 -0000 1.5.2.3 --- TimetableGridCell.java 29 Nov 2010 18:17:07 -0000 1.5.2.4 *************** *** 21,28 **** --- 21,35 ---- import java.io.Serializable; + import java.text.SimpleDateFormat; import java.util.BitSet; + import java.util.Calendar; + import java.util.Date; + import java.util.Locale; import org.unitime.commons.NaturalOrderComparator; + import org.unitime.timetable.gwt.server.DayCode; + import org.unitime.timetable.model.DatePattern; import org.unitime.timetable.model.PreferenceLevel; + import org.unitime.timetable.util.DateUtils; *************** *** 161,172 **** public boolean hasDays() { ! return iWeekCode!=null; } ! public String getDays() { ! return iDatePatternName; ! } public int getDay() { return iDay; } public int getSlot() { return iSlot; } } --- 168,257 ---- public boolean hasDays() { ! return iWeekCode != null && iDatePatternName != null; } ! public String getDays() { return iDatePatternName; } ! public void setDays(String days) { iDatePatternName = days; } public int getDay() { return iDay; } public int getSlot() { return iSlot; } + + public static String formatDatePattern(DatePattern dp, int dayCode) { + if (dp == null || dp.isDefault()) return null; + // if (dp.getType() != DatePattern.sTypeExtended) return dp.getName(); + BitSet weekCode = dp.getPatternBitSet(); + if (weekCode.isEmpty()) return dp.getName(); + Calendar cal = Calendar.getInstance(Locale.US); cal.setLenient(true); + Date dpFirstDate = DateUtils.getDate(1, dp.getSession().getPatternStartMonth(), dp.getSession().getSessionStartYear()); + cal.setTime(dpFirstDate); + int idx = weekCode.nextSetBit(0); + cal.add(Calendar.DAY_OF_YEAR, idx); + Date first = null; + while (idx < weekCode.size() && first == null) { + if (weekCode.get(idx)) { + int dow = cal.get(Calendar.DAY_OF_WEEK); + switch (dow) { + case Calendar.MONDAY: + if ((dayCode & DayCode.MON.getCode()) != 0) first = cal.getTime(); + break; + case Calendar.TUESDAY: + if ((dayCode & DayCode.TUE.getCode()) != 0) first = cal.getTime(); + break; + case Calendar.WEDNESDAY: + if ((dayCode & DayCode.WED.getCode()) != 0) first = cal.getTime(); + break; + case Calendar.THURSDAY: + if ((dayCode & DayCode.THU.getCode()) != 0) first = cal.getTime(); + break; + case Calendar.FRIDAY: + if ((dayCode & DayCode.FRI.getCode()) != 0) first = cal.getTime(); + break; + case Calendar.SATURDAY: + if ((dayCode & DayCode.SAT.getCode()) != 0) first = cal.getTime(); + break; + case Calendar.SUNDAY: + if ((dayCode & DayCode.SUN.getCode()) != 0) first = cal.getTime(); + break; + } + } + cal.add(Calendar.DAY_OF_YEAR, 1); idx++; + } + if (first == null) return dp.getName(); + cal.setTime(dpFirstDate); + idx = weekCode.length() - 1; + cal.add(Calendar.DAY_OF_YEAR, idx); + Date last = null; + while (idx >= 0 && last == null) { + if (weekCode.get(idx)) { + int dow = cal.get(Calendar.DAY_OF_WEEK); + switch (dow) { + case Calendar.MONDAY: + if ((dayCode & DayCode.MON.getCode()) != 0) last = cal.getTime(); + break; + case Calendar.TUESDAY: + if ((dayCode & DayCode.TUE.getCode()) != 0) last = cal.getTime(); + break; + case Calendar.WEDNESDAY: + if ((dayCode & DayCode.WED.getCode()) != 0) last = cal.getTime(); + break; + case Calendar.THURSDAY: + if ((dayCode & DayCode.THU.getCode()) != 0) last = cal.getTime(); + break; + case Calendar.FRIDAY: + if ((dayCode & DayCode.FRI.getCode()) != 0) last = cal.getTime(); + break; + case Calendar.SATURDAY: + if ((dayCode & DayCode.SAT.getCode()) != 0) last = cal.getTime(); + break; + case Calendar.SUNDAY: + if ((dayCode & DayCode.SUN.getCode()) != 0) last = cal.getTime(); + break; + } + } + cal.add(Calendar.DAY_OF_YEAR, -1); idx--; + } + if (last == null) return dp.getName(); + SimpleDateFormat dpf = new SimpleDateFormat("MM/dd"); + return dpf.format(first) + (first.equals(last) ? "" : " - " + dpf.format(last)); + } } |
|
From: Tomas M. <to...@us...> - 2010-11-29 18:15:43
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/webutil/timegrid In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5277/JavaSource/org/unitime/timetable/webutil/timegrid Modified Files: Tag: dev_curriculum TimetableGridTable.java Log Message: Timetable page - allow for boolean expressions in the filter (e.g., ME or ENAD will match all rooms from ME or ENAD buildings) - allow for regular expressions (e.g., regex:"ME .*[A-Za-z]" will match all ME rooms ending with a character) - by default, the name must contain all the terms (e.g., ME 200 will only match ME 200 room (and not e.g., ME 2001)) - partial matches can be done by using find: attribute (e.g., find:"ME 200") - term match is case insensitive (me will match ME building) Index: TimetableGridTable.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/webutil/timegrid/TimetableGridTable.java,v retrieving revision 1.8.2.9 retrieving revision 1.8.2.10 diff -C2 -d -r1.8.2.9 -r1.8.2.10 *** TimetableGridTable.java 9 Nov 2010 12:25:50 -0000 1.8.2.9 --- TimetableGridTable.java 29 Nov 2010 18:15:35 -0000 1.8.2.10 *************** *** 41,44 **** --- 41,45 ---- import org.unitime.commons.web.Web; import org.unitime.timetable.ApplicationProperties; + import org.unitime.timetable.gwt.server.Query.TermMatcher; import org.unitime.timetable.interfaces.RoomAvailabilityInterface; import org.unitime.timetable.model.DatePattern; *************** *** 132,135 **** --- 133,137 ---- private boolean iShowInstructors = false; private boolean iShowEvents = false; + private org.unitime.timetable.gwt.server.Query iQuery = null; private String iDefaultDatePatternName = null; *************** *** 147,151 **** public void setResourceType(int resourceType) { iResourceType = resourceType; } public String getFindString() { return iFindStr; } ! public void setFindString(String findSrt) { iFindStr = findSrt;} public int getOrderBy() { return iOrderBy; } public void setOrderBy(int orderBy) { iOrderBy = orderBy; } --- 149,156 ---- public void setResourceType(int resourceType) { iResourceType = resourceType; } public String getFindString() { return iFindStr; } ! public void setFindString(String findSrt) { ! iFindStr = findSrt; ! iQuery = (findSrt == null ? null : new org.unitime.timetable.gwt.server.Query(findSrt)); ! } public int getOrderBy() { return iOrderBy; } public void setOrderBy(int orderBy) { iOrderBy = orderBy; } *************** *** 577,581 **** } ! private boolean match(String name) { if (getFindString()==null || getFindString().trim().length()==0) return true; StringTokenizer stk = new StringTokenizer(getFindString().toUpperCase()," ,"); --- 582,604 ---- } ! private boolean match(final String name) { ! return iQuery == null || iQuery.match(new TermMatcher() { ! @Override ! public boolean match(String attr, String term) { ! if (term.isEmpty()) return true; ! if (attr == null) { ! for (StringTokenizer s = new StringTokenizer(name, " ,"); s.hasMoreTokens(); ) { ! String token = s.nextToken(); ! if (term.equalsIgnoreCase(token)) return true; ! } ! } else if ("regex".equals(attr) || "regexp".equals(attr) || "re".equals(attr)) { ! return name.matches(term); ! } else if ("find".equals(attr)) { ! return name.toLowerCase().indexOf(term.toLowerCase()) >= 0; ! } ! return false; ! } ! }); ! /* if (getFindString()==null || getFindString().trim().length()==0) return true; StringTokenizer stk = new StringTokenizer(getFindString().toUpperCase()," ,"); *************** *** 586,590 **** if (n.indexOf(token)<0) return false; } ! return true; } --- 609,613 ---- if (n.indexOf(token)<0) return false; } ! return true;*/ } |
|
From: Tomas M. <to...@us...> - 2010-11-29 18:10:09
|
Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/server In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3648/JavaSource/org/unitime/timetable/gwt/server Modified Files: Tag: dev_curriculum Query.java Log Message: AtomTerm -- strip the surrounding quotation marks, if exist Index: Query.java =================================================================== RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/server/Attic/Query.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** Query.java 9 Nov 2010 12:25:51 -0000 1.1.2.2 --- Query.java 29 Nov 2010 18:10:00 -0000 1.1.2.3 *************** *** 208,211 **** --- 208,213 ---- public AtomTerm(String attr, String body) { + if (body.startsWith("\"") && body.endsWith("\"")) + body = body.substring(1, body.length() - 1); iAttr = attr; iBody = body; } |
