Skip to content

Milestone 0.5 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Anysysjgw wants to merge 92 commits into
base: master
Choose a base branch
from
Open

Milestone 0.5 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
dbae65f
First commit
Anysysjgw Nov 16, 2014
93db568
Update
Anysysjgw Nov 16, 2014
f5aeb23
Update .gitignore II
Anysysjgw Nov 16, 2014
44c7251
Update again
Anysysjgw Nov 16, 2014
75b4e0e
Update again
Anysysjgw Nov 16, 2014
aeab3f0
Update .gitingore to ignore /build and /upload
Anysysjgw Nov 16, 2014
7c45355
Reverse .gitignore to comen/map's version
Anysysjgw Nov 16, 2014
712657a
Implement User and Data classes
Anysysjgw Nov 17, 2014
f772a0a
Understand the whole architecture by implementing user's Login
Anysysjgw Nov 18, 2014
e95ad2a
Solve conflict between Anysysjgw/map and comen/map
Anysysjgw Nov 19, 2014
d2ee123
Merge branch 'comen-master'
Anysysjgw Nov 19, 2014
d184869
Synchronize from comen/map
Anysysjgw Nov 19, 2014
f7a0350
Merge branch 'master' of github.com:comen/map into comen-master
Anysysjgw Nov 19, 2014
905b94d
Merge branch 'comen-master'
Anysysjgw Nov 19, 2014
4a846a9
DWZ framework is used
Anysysjgw Nov 19, 2014
215756e
Merge remote with my local version
Nov 21, 2014
dc8fa5c
Merge branch 'comen-master'
Nov 21, 2014
dd44559
Static web pages finished.
Nov 23, 2014
68d5f96
Merge branch 'master' of github.com:comen/map into comen-master
Nov 23, 2014
4b50775
Practice merge if confilcts
Nov 23, 2014
9d303b3
Merge with new functions of comen/master
Nov 23, 2014
df7dc30
Merge branch 'comen-master'
Nov 23, 2014
0914412
Dynamic pages partially implemented
Nov 27, 2014
02f3166
Save work - Done with Change password & Add user & Edit user.
Nov 29, 2014
30ce804
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
Nov 29, 2014
9f308e0
Newest map code from comen
Nov 29, 2014
6a11ebf
Merge branch 'comen-master'
Nov 29, 2014
b2c4ac3
Re-arrange
Nov 29, 2014
3e101ff
Merge with newest map.jsp & Fix display error of map.jsp
Nov 30, 2014
0c9fe6f
Save work - Change DataProcessor's Logic
Nov 30, 2014
69f00ff
Merge with new features of logging
Dec 1, 2014
ba9653d
Merge branch 'comen-master'
Dec 1, 2014
ec5019c
Perfect Data Utility and realize checking for special display of sale…
Dec 1, 2014
3d8c978
Modify some web pages.
Dec 1, 2014
903b7f6
Integrate with map.jsp
Dec 1, 2014
f9efc69
Realize upload of sales data 50%
Dec 2, 2014
e782213
Sales data upload finished.
Dec 3, 2014
3fb3170
80% finish User List functionality & Perfect Sales Data Upload
Dec 4, 2014
ae49d5a
Implement Grid Management
Dec 5, 2014
a170b7e
Wrap code of get Sales Data Fields' desc and qty in Data entity
Dec 6, 2014
e775b39
Merge with comen-master
Dec 6, 2014
dd8cc26
Merge branch 'comen-master'
Dec 6, 2014
73c5f1b
Fix errors to display map
Dec 6, 2014
8806198
Synchronize newest Data entity and DateUtils
Dec 6, 2014
50f4a4d
Merge branch 'comen-master'
Dec 6, 2014
46b97dd
Complete functionalities of add/edit/delete Grid data, as well as get…
Dec 6, 2014
a94b251
merge with comen-master
Dec 7, 2014
f27627c
Merge branch 'comen-master'
Dec 7, 2014
c87ca4b
Save work
Dec 7, 2014
b643fd5
Update Date Format in conf file
Dec 8, 2014
82c5e39
Merge with comen-master
Dec 8, 2014
9eaf16a
Merge branch 'comen-master'
Dec 8, 2014
1a927a9
Save work - Page breakdown
Dec 9, 2014
5b2d41e
Pager completed
Dec 11, 2014
4f85cc5
Comlete Sales Data Field Management
Dec 12, 2014
b78dce2
Merge with comen-master: File uploading updated
Dec 12, 2014
f8277c1
Merge branch 'comen-master'
Dec 12, 2014
338ea9c
Complete advanced search
Dec 12, 2014
4645001
Configure file modified
Dec 13, 2014
ec70010
Merge branch 'master' of github.com:comen/map into comen-master
Dec 13, 2014
9efa160
Merge branch 'comen-master'
Dec 13, 2014
a4318fc
Fix some issues
Dec 13, 2014
e5d1d00
Delete record by code and date
Dec 13, 2014
acbe3f4
Move jar to /WebContent/WEB-INF/lib/, and update .gitignore
Dec 14, 2014
410a258
Merge with comen-master, and fix issues of FileUtils.readFile()
Dec 15, 2014
59c8b1d
Merge branch 'comen-master'
Dec 15, 2014
389964c
Released for Unit Test
Dec 15, 2014
c993b0e
Change TimeZone to 'Asia/Shanghai', and use BasicDBObject for User/Data
Dec 17, 2014
10cd740
Display zero in fields for grid that has no sales data
Dec 17, 2014
d047c23
Merge with comen/master to upgrade excel uploading
Dec 18, 2014
c329a62
Merge branch 'comen-master'
Dec 18, 2014
767b303
Add authority check for deleting records
Dec 19, 2014
7060c33
Merge with comen-master
Dec 19, 2014
1f02aeb
Merge branch 'comen-master'
Dec 19, 2014
624b377
Update login.jsp
Dec 19, 2014
070e769
Final release
Dec 19, 2014
9287105
Fix xls file uploading error, replace System.out.println with logger,…
Dec 19, 2014
8807cea
Remove uploadGrid
Dec 19, 2014
8d5e918
Modify desc for uploading page, fix issue when searching GridList
Dec 20, 2014
36de1c6
Show friendly message in grid edit page if new grid code already exists
Anysysjgw Dec 21, 2014
7bc9836
Add help document
Anysysjgw Dec 21, 2014
665990b
Update program according to revision suggestion
Anysysjgw Jan 1, 2015
481a875
Dialog page modification
Anysysjgw Jan 2, 2015
150f3b4
Add sales data deleting operation
Anysysjgw Jan 3, 2015
22645f0
Add uploadDate field to Data Entity; Add uploadDate to sales data del…
Anysysjgw Jan 4, 2015
a6b1a12
Fix some bugs.
Anysysjgw Jan 5, 2015
e76d640
Help document added
Anysysjgw Jan 7, 2015
2b25e94
Help document updated
Anysysjgw Jan 8, 2015
77469d3
Help document modified
Anysysjgw Jan 9, 2015
f8cb748
Modify timeout settings
Anysysjgw Jan 10, 2015
36281a6
Fix issue of special display in Office/Suboffice level
Anysysjgw Jan 13, 2015
6b1f44b
Fix issue of grid's special display in week/month level
Anysysjgw Jan 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Map</name>
<comment></comment>
<comment>China Telecom Map v1.0</comment>
<projects>
</projects>
<buildSpec>
Expand Down
15 changes: 9 additions & 6 deletions .settings/.jsdtscope
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="WebContent"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<classpathentry kind="src" path="WebContent" />
<classpathentry kind="con"
path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER" />
<classpathentry kind="con"
path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true"/>
<attribute name="hide" value="true" />
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="output" path=""/>
<classpathentry kind="con"
path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary" />
<classpathentry kind="output" path="" />
</classpath>
1 change: 1 addition & 0 deletions .settings/org.eclipse.core.resources.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
eclipse.preferences.version=1
encoding//WebContent/jsp/login.jsp=UTF-8
encoding/<project>=UTF-8
16 changes: 9 additions & 7 deletions .settings/org.eclipse.wst.common.component
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="Map">
<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<property name="context-root" value="Map"/>
<property name="java-output-path" value="/Map/build/classes"/>
</wb-module>
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="Map">
<wb-resource deploy-path="/" source-path="/WebContent"
tag="defaultRootSource" />
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src" />
<property name="context-root" value="Map" />
<property name="java-output-path" value="/Map/build/classes" />
</wb-module>
</project-modules>
14 changes: 7 additions & 7 deletions .settings/org.eclipse.wst.common.project.facet.core.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="Apache Tomcat v8.0"/>
<fixed facet="java"/>
<fixed facet="jst.web"/>
<fixed facet="wst.jsdt.web"/>
<installed facet="java" version="1.8"/>
<installed facet="jst.web" version="3.1"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<runtime name="Apache Tomcat v8.0" />
<fixed facet="java" />
<fixed facet="jst.web" />
<fixed facet="wst.jsdt.web" />
<installed facet="java" version="1.8" />
<installed facet="jst.web" version="3.1" />
<installed facet="wst.jsdt.web" version="1.0" />
</faceted-project>
12 changes: 12 additions & 0 deletions RemoteSystemsTempFiles/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>RemoteSystemsTempFiles</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
<nature>org.eclipse.rse.ui.remoteSystemsTempNature</nature>
</natures>
</projectDescription>
11 changes: 11 additions & 0 deletions WebContent/dwz/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>dwz-ria</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
Loading