diff --git a/.classpath b/.classpath deleted file mode 100644 index 8b8d389..0000000 --- a/.classpath +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index 84c048a..ef01e39 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /build/ +.idea/ +target/ diff --git a/.project b/.project deleted file mode 100644 index 8253d22..0000000 --- a/.project +++ /dev/null @@ -1,31 +0,0 @@ - - - text2 - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 4dc926e..49b8b34 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,8 +1,8 @@ - + - - + + diff --git a/README.md b/README.md index 37858f0..3a74cd9 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,80 @@ # house -基于ssm的房屋租赁管理系统 -功能介绍 -房源信息模块： -房源信息展示、房源信息更新、房源信息增加、房源信息删除 -账户管理模块： -账户登录、账户绑定、账户管理 -租金结算模块： -每月租金信息、租金交付功能、月租金收入总额统计 -房屋租赁合同管理模块： -房屋租赁合同录入、房屋租赁合同展示、房屋租赁价格修改、房屋租赁合同终止 -报障模块： -租客报账、管理员报障审核、租客报障统计 -日程模块： -收租日程显示 -项目介绍 -框架： -项目整体采用spring+springMVC+mybatis框架 - -数据库： -使用mysql数据库 - -服务器： -Tomcat服务器部署 - - -项目功能部分截图 -登录 -管理员帐户:admin 密码：12345 -租客帐户：zyx 密码：123456 +**基于ssm的房屋租赁管理系统** +## 1.部署相关 +[编写Dockerfile定制tomcat8镜像](https://www.yuque.com/shihuangzhedebiji/web-server/dwxivb) + +我在pom打包时把war包放在了docker文件夹下 + +**Dockerfile** +```bash +# 直接从docker提供的远程镜像仓库中拉取最新的tomcat组件 +FROM tomcat:8.5.51 + +# 本镜像的制作者的信息 +MAINTAINER "eyck.cui" + +# 把该容器的时区设置为上海时区 +ENV TZ=Asia/Shanghai + +# 把当前文件目录下的docker-ssm.war移动到容器中tomcat自动启动的目录下 +COPY ./house.war /usr/local/tomcat/webapps/ +``` +### 1.1 打包 + +![打包](http://ww1.sinaimg.cn/large/d1db9fd3gy1ga48p0s8dzj212o0jajuc.jpg) + +### 1.2 服务器docker库 + +![服务器docker库](http://ww1.sinaimg.cn/large/d1db9fd3gy1ga48qvpokyj20y50om3zz.jpg) + +### 1.3 docker-compose部署 + +![docker-compose部署](http://ww1.sinaimg.cn/large/d1db9fd3gy1ga48tuufucj211j0lhju4.jpg) + +## 功能介绍 + +- 房源信息模块 + - 房源信息展示 + - 房源信息更新 + - 房源信息增加 + - 房源信息删除 +- 账户管理模块 + - 账户登录 + - 账户绑定 + - 账户管理 +- 租金结算模块 + - 每月租金信息 + - 租金交付功能 + - 月租金收入总额统计 +- 房屋租赁合同管理模块 + - 房屋租赁合同录入 + - 房屋租赁合同展示 + - 房屋租赁价格修改 + - 房屋租赁合同终止 +- 报障模块 + - 租客报账 + - 管理员报障审核 + - 租客报障统计 +- 日程模块 + - 收租日程显示 +## 框架介绍 +原始项目： + - Spring + - SpringMVC + - MyBatis + - MySQL数据库 + - Tomcat服务器 + + 新增： + - Docker部署 + - Maven 项目版本管理工具 + + +## 项目功能部分截图 +登录 +- 管理员帐户:`admin` 密码：`12345` +- 租客帐户：`zyx` 密码：`123456` ![Alt text](https://github.com/chiuwingyan/house/blob/master/img/1.png) ![Alt text](https://github.com/chiuwingyan/house/blob/master/img/2.png) ![Alt text](https://github.com/chiuwingyan/house/blob/master/img/3.png) @@ -36,3 +82,8 @@ Tomcat服务器部署 ![Alt text](https://github.com/chiuwingyan/house/blob/master/img/5.png) ![Alt text](https://github.com/chiuwingyan/house/blob/master/img/6.png) +## Demo地址 + +[Demo在线](http://47.101.145.181:9898/house/login.action) + +个人服务器跑的,请勿瞎搞谢谢 diff --git a/WebContent/WEB-INF/lib/jackson-annotations-2.4.0.jar b/WebContent/WEB-INF/lib/jackson-annotations-2.4.0.jar deleted file mode 100644 index 0b55559..0000000 Binary files a/WebContent/WEB-INF/lib/jackson-annotations-2.4.0.jar and /dev/null differ diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml deleted file mode 100644 index ac0b6c7..0000000 --- a/WebContent/WEB-INF/web.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - text2 - - index.html - index.htm - index.jsp - default.html - default.htm - default.jsp - - - - - contextConfigLocation - classpath:ApplicationContext-*.xml - - - org.springframework.web.context.ContextLoaderListener - - - - - - springMvc - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - classpath:SpringMvc.xml - - - 1 - - - springMvc - *.action - - - - - CharacterEncodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - utf-8 - - - - CharacterEncodingFilter - /* - - \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..9589cf7 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,11 @@ +# 直接从docker提供的远程镜像仓库中拉取最新的tomcat组件 +FROM tomcat:8.5.51 + +# 本镜像的制作者的信息 +MAINTAINER "eyck.cui" + +# 把该容器的时区设置为上海时区 +ENV TZ=Asia/Shanghai + +# 把当前文件目录下的docker-ssm.war移动到容器中tomcat自动启动的目录下 +COPY ./house.war /usr/local/tomcat/webapps/ \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 0000000..4dc0b2e --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,15 @@ +version: '2' +services: + house: + build: + context: ./ + dockerfile: ./Dockerfile + ports: + - 9898:8080 + extra_hosts: + - "tools-jdbc:172.17.0.1" + - "tools-docker:172.17.0.1" + restart: always + container_name: house + hostname: tools-docker + image: house \ No newline at end of file diff --git a/docker/house.war b/docker/house.war new file mode 100644 index 0000000..26f09c7 Binary files /dev/null and b/docker/house.war differ diff --git a/house.iml b/house.iml new file mode 100644 index 0000000..53f0043 --- /dev/null +++ b/house.iml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/javax.annotation.jar b/lib/javax.annotation.jar new file mode 100644 index 0000000..52dca7f Binary files /dev/null and b/lib/javax.annotation.jar differ diff --git a/lib/javax.ejb.jar b/lib/javax.ejb.jar new file mode 100644 index 0000000..4ebf5ec Binary files /dev/null and b/lib/javax.ejb.jar differ diff --git a/lib/javax.jms.jar b/lib/javax.jms.jar new file mode 100644 index 0000000..d31451a Binary files /dev/null and b/lib/javax.jms.jar differ diff --git a/lib/javax.persistence.jar b/lib/javax.persistence.jar new file mode 100644 index 0000000..21d80e0 Binary files /dev/null and b/lib/javax.persistence.jar differ diff --git a/lib/javax.resource.jar b/lib/javax.resource.jar new file mode 100644 index 0000000..696a234 Binary files /dev/null and b/lib/javax.resource.jar differ diff --git a/lib/javax.servlet.jar b/lib/javax.servlet.jar new file mode 100644 index 0000000..0519e4a Binary files /dev/null and b/lib/javax.servlet.jar differ diff --git a/lib/javax.servlet.jsp.jar b/lib/javax.servlet.jsp.jar new file mode 100644 index 0000000..9c0631c Binary files /dev/null and b/lib/javax.servlet.jsp.jar differ diff --git a/lib/javax.transaction.jar b/lib/javax.transaction.jar new file mode 100644 index 0000000..729c695 Binary files /dev/null and b/lib/javax.transaction.jar differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..f6534a0 --- /dev/null +++ b/pom.xml @@ -0,0 +1,69 @@ + + + 4.0.0 + + store.zabbix + house + 1.0.0 + ${project.artifactId} + war + + + UTF-8 + + + + + com.mchange + c3p0 + 0.9.5.2 + + + org.projectlombok + lombok + 1.18.10 + provided + + + + com.fasterxml.jackson.core + jackson-annotations + 2.10.1 + + + + + + + org.apache.maven.plugins + maven-war-plugin + 3.2.3 + + ${project.artifactId} + + + lib/ + WEB-INF/lib + + *.jar + + + + ${basedir}/docker/ + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 8 + 8 + + + + + + \ No newline at end of file diff --git a/src/ApplicationContext-dao.xml b/src/ApplicationContext-dao.xml deleted file mode 100644 index 7399552..0000000 --- a/src/ApplicationContext-dao.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - dialect=mysql - - - - - - - - - - - - - diff --git a/src/ApplicationContext-service.xml b/src/ApplicationContext-service.xml deleted file mode 100644 index 0a29331..0000000 --- a/src/ApplicationContext-service.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/ApplicationContext-trans.xml b/src/ApplicationContext-trans.xml deleted file mode 100644 index 96549be..0000000 --- a/src/ApplicationContext-trans.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Pojo/Apply.java b/src/Pojo/Apply.java deleted file mode 100644 index 112e138..0000000 --- a/src/Pojo/Apply.java +++ /dev/null @@ -1,68 +0,0 @@ -package Pojo; - -public class Apply { -private Integer id; -private String house_id; -private String address; -private double area; -private double price; -private Integer userlist_id; -private String status; -private Userlist userlist; -public Userlist getUserlist() { - return userlist; -} -public void setUserlist(Userlist userlist) { - this.userlist = userlist; -} -public String getStatus() { - return status; -} -public void setStatus(String status) { - this.status = status; -} -public Integer getId() { - return id; -} -public void setId(Integer id) { - this.id = id; -} -public String getHouse_id() { - return house_id; -} -public void setHouse_id(String house_id) { - this.house_id = house_id; -} -public String getAddress() { - return address; -} -public void setAddress(String address) { - this.address = address; -} -public double getArea() { - return area; -} -public void setArea(double area) { - this.area = area; -} -public double getPrice() { - return price; -} -public void setPrice(double price) { - this.price = price; -} -public Integer getUserlist_id() { - return userlist_id; -} -public void setUserlist_id(Integer userlist_id) { - this.userlist_id = userlist_id; -} -@Override -public String toString() { - return "Apply [id=" + id + ", house_id=" + house_id + ", address=" + address + ", area=" + area + ", price=" + price - + ", userlist_id=" + userlist_id + ", status=" + status + ", userlist=" + userlist + "]"; -} - - - -} diff --git a/src/SpringMvc.xml b/src/SpringMvc.xml deleted file mode 100644 index 6e79485..0000000 --- a/src/SpringMvc.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 5242880 - - - - diff --git a/src/SqlMapConfig.xml b/src/SqlMapConfig.xml deleted file mode 100644 index 56c35e0..0000000 --- a/src/SqlMapConfig.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/src/controller/ApplyController.java b/src/controller/ApplyController.java deleted file mode 100644 index 3a84193..0000000 --- a/src/controller/ApplyController.java +++ /dev/null @@ -1,117 +0,0 @@ -package controller; - -import java.util.List; - -import javax.servlet.http.HttpSession; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; - -import Pojo.Apply; -import Pojo.Houselist; -import Pojo.User; -import Pojo.Userlist; -import Pojo.Zulist; -import service.ApplyService; -import service.HouselistService; -import service.UserlistService; - -@Controller -public class ApplyController { - @Autowired - private UserlistService userlistService; - @Autowired - private HouselistService houselistService; - @Autowired - private ApplyService applyService; - //申请看房 - @RequestMapping("/applycheckuserlist") - public String applycheckuserlist(HttpSession httpSession,Model model,Integer id){ - User user1= (User) httpSession.getAttribute("user"); - Integer user_id=user1.getId(); - Userlist list=userlistService.findhasuserlist(user_id); - if(list==null){ - model.addAttribute("error", "applycheck"); - return "redirect:houselist.action"; - }else{ - Houselist houselist=houselistService.findid(id); - houselist.setStatus("已被申请"); - houselistService.updatehousestatus(houselist); - Integer userlist_id=list.getId(); - Apply apply=new Apply(); - apply.setHouse_id(houselist.getHouseid()); - apply.setAddress(houselist.getAddress()); - apply.setPrice(houselist.getPrice()); - apply.setArea(houselist.getArea()); - apply.setStatus("申请中"); - apply.setUserlist_id(userlist_id); - applyService.insertapply(apply); - model.addAttribute("error", "applysuccess"); - return "redirect:houselist.action"; - - - } - - } - //管理员查看申请看房列表 - @RequestMapping("/findapplylist") - public String findapplylist(Model model,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize) throws Exception{ - PageHelper.startPage(page, pageSize); - List applylist=applyService.findapplylist(); - PageInfo p=new PageInfo(applylist); - model.addAttribute("applylist",applylist); - model.addAttribute("p", p); - model.addAttribute("mainPage","applylist.jsp"); - return "admin/main1"; - } - - @RequestMapping("/applychangehousestatus") - public String applychangehousestatus(HttpSession httpSession,Model model,String house_id)throws Exception{ - User user1= (User) httpSession.getAttribute("user"); - Integer user_id=user1.getId(); - Userlist userlist=userlistService.findhasuserlist(user_id); - Houselist houselist=houselistService.findhouseid(house_id); - houselist.setStatus("已租赁"); - houselistService.updatehousestatus(houselist); - Zulist zulist=new Zulist(); - zulist.setHouse_id(house_id); - zulist.setPrice(houselist.getPrice()); - zulist.setAddress(houselist.getAddress()); - - return ""; - } - //管理员拒绝看房申请 - @RequestMapping("/refuseapply") - public String refuseapply(String house_id,Model model){ - Houselist houselist=new Houselist(); - houselist.setHouseid(house_id); - houselist.setStatus("未租赁"); - applyService.refuseapply(houselist); - - return "redirect:findapplylist.action"; - } - - //租客查看自己的 看房申请 - @RequestMapping("/getmyapply") - public String getmyapply(Model model,HttpSession httpSession,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - User user1= (User) httpSession.getAttribute("user"); - Userlist userlist=userlistService.findhasuserlist(user1.getId()); - PageHelper.startPage(page, pageSize); - List list=userlistService.getmyapply(userlist.getId()); - PageInfo p=new PageInfo(list); - model.addAttribute("userlist", list); - model.addAttribute("p", p); - model.addAttribute("mainPage", "myapply.jsp"); - return "zuke/main"; - } - - -} diff --git a/src/controller/UserController.java b/src/controller/UserController.java deleted file mode 100644 index 603a9e3..0000000 --- a/src/controller/UserController.java +++ /dev/null @@ -1,56 +0,0 @@ -package controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.ModelAndView; - -import Pojo.User; -import service.UserService; - -@Controller - -public class UserController { - - @Autowired - private UserService userService; - - @RequestMapping("/login") - public String userList() throws Exception{ - - - return "login"; - - } - @RequestMapping("/logincheck") - public String login(User user,Model model,HttpSession httpSession) throws Exception{ - - User user1=userService.login(user); - - if(user1!=null){ - httpSession.setAttribute("user", user1); - if(user1.getType().equals("zuke")){ - return "zuke/main"; - } - else{ - return "admin/main1"; - } - }else{ - String error="error"; - model.addAttribute("error", error); - return "login"; - } - } - @RequestMapping("/toindex") - public String toindex(Model model) throws Exception{ - - - return "admin/index"; - } - } - diff --git a/src/dao/WrongMapper.xml b/src/dao/WrongMapper.xml deleted file mode 100644 index a3226f0..0000000 --- a/src/dao/WrongMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - insert into wrong(house_id,address,date,detail,status,name,userlist_id) - values(#{house_id},#{address},#{date},#{detail},#{status},#{name},#{userlist_id}) - - - delete from wrong where id=#{id} - - \ No newline at end of file diff --git a/src/db.properties b/src/db.properties deleted file mode 100644 index 8058e29..0000000 --- a/src/db.properties +++ /dev/null @@ -1,4 +0,0 @@ -jdbc.driver=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://localhost:3306/zu?characterEncoding=utf-8 -jdbc.username=root -jdbc.password= \ No newline at end of file diff --git a/src/main/java/store/zabbix/controller/ApplyController.java b/src/main/java/store/zabbix/controller/ApplyController.java new file mode 100644 index 0000000..8af8828 --- /dev/null +++ b/src/main/java/store/zabbix/controller/ApplyController.java @@ -0,0 +1,120 @@ +package store.zabbix.controller; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import store.zabbix.pojo.Apply; +import store.zabbix.pojo.Houselist; +import store.zabbix.pojo.User; +import store.zabbix.pojo.Userlist; +import store.zabbix.pojo.Zulist; +import store.zabbix.service.ApplyService; +import store.zabbix.service.HouselistService; +import store.zabbix.service.UserlistService; + +import javax.servlet.http.HttpSession; + +@Controller +public class ApplyController { + @Autowired + private UserlistService userlistService; + @Autowired + private HouselistService houselistService; + @Autowired + private ApplyService applyService; + + //申请看房 + @RequestMapping("/applycheckuserlist") + public String applycheckuserlist(HttpSession httpSession, Model model, Integer id) { + User user1 = (User) httpSession.getAttribute("user"); + Integer user_id = user1.getId(); + Userlist list = userlistService.findhasuserlist(user_id); + if (list == null) { + model.addAttribute("error", "applycheck"); + return "redirect:houselist.action"; + } else { + Houselist houselist = houselistService.findid(id); + houselist.setStatus("已被申请"); + houselistService.updatehousestatus(houselist); + Integer userlist_id = list.getId(); + Apply apply = new Apply(); + apply.setHouse_id(houselist.getHouseid()); + apply.setAddress(houselist.getAddress()); + apply.setPrice(houselist.getPrice()); + apply.setArea(houselist.getArea()); + apply.setStatus("申请中"); + apply.setUserlist_id(userlist_id); + applyService.insertapply(apply); + model.addAttribute("error", "applysuccess"); + return "redirect:houselist.action"; + + + } + + } + + //管理员查看申请看房列表 + @RequestMapping("/findapplylist") + public String findapplylist(Model model, @RequestParam(required = false, defaultValue = "1") Integer page, + @RequestParam(required = false, defaultValue = "2") Integer pageSize) throws Exception { + PageHelper.startPage(page, pageSize); + List applylist = applyService.findapplylist(); + PageInfo p = new PageInfo(applylist); + model.addAttribute("applylist", applylist); + model.addAttribute("p", p); + model.addAttribute("mainPage", "applylist.jsp"); + return "admin/main1"; + } + + @RequestMapping("/applychangehousestatus") + public String applychangehousestatus(HttpSession httpSession, Model model, String house_id) throws Exception { + User user1 = (User) httpSession.getAttribute("user"); + Integer user_id = user1.getId(); + Userlist userlist = userlistService.findhasuserlist(user_id); + Houselist houselist = houselistService.findhouseid(house_id); + houselist.setStatus("已租赁"); + houselistService.updatehousestatus(houselist); + Zulist zulist = new Zulist(); + zulist.setHouse_id(house_id); + zulist.setPrice(houselist.getPrice()); + zulist.setAddress(houselist.getAddress()); + + return ""; + } + + //管理员拒绝看房申请 + @RequestMapping("/refuseapply") + public String refuseapply(String house_id, Model model) { + Houselist houselist = new Houselist(); + houselist.setHouseid(house_id); + houselist.setStatus("未租赁"); + applyService.refuseapply(houselist); + + return "redirect:findapplylist.action"; + } + + //租客查看自己的 看房申请 + @RequestMapping("/getmyapply") + public String getmyapply(Model model, HttpSession httpSession, @RequestParam(required = false, defaultValue = "1") Integer page, + @RequestParam(required = false, defaultValue = "2") Integer pageSize) { + User user1 = (User) httpSession.getAttribute("user"); + Userlist userlist = userlistService.findhasuserlist(user1.getId()); + PageHelper.startPage(page, pageSize); + List list = userlistService.getmyapply(userlist.getId()); + PageInfo p = new PageInfo(list); + model.addAttribute("userlist", list); + model.addAttribute("p", p); + model.addAttribute("mainPage", "myapply.jsp"); + return "zuke/main"; + } + + +} diff --git a/src/controller/ApplyoutController.java b/src/main/java/store/zabbix/controller/ApplyoutController.java similarity index 90% rename from src/controller/ApplyoutController.java rename to src/main/java/store/zabbix/controller/ApplyoutController.java index dfc0bd0..42fbc46 100644 --- a/src/controller/ApplyoutController.java +++ b/src/main/java/store/zabbix/controller/ApplyoutController.java @@ -1,92 +1,91 @@ -package controller; - -import java.util.List; - -import javax.servlet.http.HttpSession; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; - -import Pojo.Applyout; -import Pojo.Houselist; -import Pojo.User; -import Pojo.Userlist; -import Pojo.Zulist; -import service.ApplyoutService; -import service.UserlistService; -import service.ZulistService; - -@Controller -@RequestMapping("/applyout") -public class ApplyoutController { - @Autowired - private ZulistService zulistService; - @Autowired - private ApplyoutService applyoutService; - @Autowired - private UserlistService userlistService; - //插入退租信息 - @RequestMapping("/insertapplyout") - public String insertapplyout(String house_id,Model model){ - Zulist zulist=zulistService.findzulist(house_id); - applyoutService.insertapplyout(zulist); - model.addAttribute("error", "applysuccess"); - return "redirect:/zulist/myzulist.action"; - } - //查看退租申请 - @RequestMapping("/findallapplyout") - public String findallapplyout(Model model ,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - PageHelper.startPage(page, pageSize); - List applyout=applyoutService.findallapplyout(); - PageInfo p=new PageInfo(applyout); - model.addAttribute("applyout", applyout); - model.addAttribute("p", p); - model.addAttribute("mainPage", "applyout.jsp"); - return "admin/main1"; - } - //管理员拒绝退租申请 - @RequestMapping("/refuseapplyout") - public String refuseapplyout(Model model,Integer id){ - Applyout applyout=new Applyout(); - applyout.setId(id); - applyout.setStatus("已拒绝"); - applyoutService.updateapplyout(applyout); - model.addAttribute("mainPage", "applyout.jsp"); - return "redirect:findallapplyout.action"; - } - //管理员同意退租申请 - @RequestMapping("/agreeapplyout") - public String agreeapplyout(Model model,Integer id){ - applyoutService.agreeapplyout(id); - model.addAttribute("error", "applyoutsucess"); - return "redirect:findallapplyout.action"; - } - //删除申请退租列表 - @RequestMapping("/deleteapplyout") - public String deleteapplyout(Model model,Integer id){ - applyoutService.deleteapplyout(id); - model.addAttribute("error", "deletesucess"); - return "redirect:findallapplyout.action"; - } - //租客查看自己的 退房申请 - @RequestMapping("/getmyapplyout") - public String getmyapplyout(Model model,HttpSession httpSession,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - User user1= (User) httpSession.getAttribute("user"); - Userlist userlist=userlistService.findhasuserlist(user1.getId()); - PageHelper.startPage(page, pageSize); - List list=userlistService.getmyapplyout(userlist.getId()); - PageInfo p=new PageInfo(list); - model.addAttribute("userlist", list); - model.addAttribute("p", p); - model.addAttribute("mainPage", "myapplyout.jsp"); - return "zuke/main"; - } -} +package store.zabbix.controller; + +import java.util.List; + +import javax.servlet.http.HttpSession; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import store.zabbix.pojo.Applyout; +import store.zabbix.pojo.User; +import store.zabbix.pojo.Userlist; +import store.zabbix.pojo.Zulist; +import store.zabbix.service.ApplyoutService; +import store.zabbix.service.UserlistService; +import store.zabbix.service.ZulistService; + +@Controller +@RequestMapping("/applyout") +public class ApplyoutController { + @Autowired + private ZulistService zulistService; + @Autowired + private ApplyoutService applyoutService; + @Autowired + private UserlistService userlistService; + //插入退租信息 + @RequestMapping("/insertapplyout") + public String insertapplyout(String house_id,Model model){ + Zulist zulist=zulistService.findzulist(house_id); + applyoutService.insertapplyout(zulist); + model.addAttribute("error", "applysuccess"); + return "redirect:/zulist/myzulist.action"; + } + //查看退租申请 + @RequestMapping("/findallapplyout") + public String findallapplyout(Model model ,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize){ + PageHelper.startPage(page, pageSize); + List applyout=applyoutService.findallapplyout(); + PageInfo p=new PageInfo(applyout); + model.addAttribute("applyout", applyout); + model.addAttribute("p", p); + model.addAttribute("mainPage", "applyout.jsp"); + return "admin/main1"; + } + //管理员拒绝退租申请 + @RequestMapping("/refuseapplyout") + public String refuseapplyout(Model model,Integer id){ + Applyout applyout=new Applyout(); + applyout.setId(id); + applyout.setStatus("已拒绝"); + applyoutService.updateapplyout(applyout); + model.addAttribute("mainPage", "applyout.jsp"); + return "redirect:findallapplyout.action"; + } + //管理员同意退租申请 + @RequestMapping("/agreeapplyout") + public String agreeapplyout(Model model,Integer id){ + applyoutService.agreeapplyout(id); + model.addAttribute("error", "applyoutsucess"); + return "redirect:findallapplyout.action"; + } + //删除申请退租列表 + @RequestMapping("/deleteapplyout") + public String deleteapplyout(Model model,Integer id){ + applyoutService.deleteapplyout(id); + model.addAttribute("error", "deletesucess"); + return "redirect:findallapplyout.action"; + } + //租客查看自己的 退房申请 + @RequestMapping("/getmyapplyout") + public String getmyapplyout(Model model,HttpSession httpSession,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize){ + User user1= (User) httpSession.getAttribute("user"); + Userlist userlist=userlistService.findhasuserlist(user1.getId()); + PageHelper.startPage(page, pageSize); + List list=userlistService.getmyapplyout(userlist.getId()); + PageInfo p=new PageInfo(list); + model.addAttribute("userlist", list); + model.addAttribute("p", p); + model.addAttribute("mainPage", "myapplyout.jsp"); + return "zuke/main"; + } +} diff --git a/src/controller/CheckoutController.java b/src/main/java/store/zabbix/controller/CheckoutController.java similarity index 90% rename from src/controller/CheckoutController.java rename to src/main/java/store/zabbix/controller/CheckoutController.java index 69034f6..ff5c4aa 100644 --- a/src/controller/CheckoutController.java +++ b/src/main/java/store/zabbix/controller/CheckoutController.java @@ -1,69 +1,68 @@ -package controller; - - - -import java.util.List; - -import javax.servlet.http.HttpSession; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; - -import Pojo.Checkout; -import Pojo.Houselist; -import Pojo.User; -import Pojo.Userlist; -import service.CheckoutService; -import service.UserlistService; -@Controller -@RequestMapping("/checkout") -public class CheckoutController { - @Autowired - private CheckoutService checkoutService; - @Autowired - private UserlistService userlistService; - - @RequestMapping("/getallcheckout") - public String getallcheckout(Model model ,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - PageHelper.startPage(page, pageSize); - List checkout=checkoutService.getallcheckout(); - PageInfo p=new PageInfo(checkout); - model.addAttribute("p", p); - model.addAttribute("checkout", checkout); - model.addAttribute("mainPage", "checkout.jsp"); - return "admin/main1"; - } - //租客删除自己已退租列表 - @RequestMapping("/deletecheckout") - public String deletecheckout(Integer id ) { - checkoutService.deletecheckout(id); - return "redirect:/checkout/getmycheckout.action"; - } - //租客删除自己已退租列表 - @RequestMapping("/admindeletecheckout") - public String admindeletecheckout(Integer id ) { - checkoutService.deletecheckout(id); - return "redirect:/checkout/getallcheckout.action"; - } - - @RequestMapping("/getmycheckout") - public String getmycheckout(Model model,HttpSession httpSession,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize) { - User user1= (User) httpSession.getAttribute("user"); - Userlist userlist=userlistService.findhasuserlist(user1.getId()); - PageHelper.startPage(page, pageSize); - List list=userlistService.getmycheckout(userlist.getId()); - PageInfo p=new PageInfo(list); - model.addAttribute("p", p); - model.addAttribute("userlistcheck", list); - model.addAttribute("mainPage","mycheckout.jsp"); - return "zuke/main"; - } -} +package store.zabbix.controller; + + + +import java.util.List; + +import javax.servlet.http.HttpSession; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import store.zabbix.pojo.Checkout; +import store.zabbix.pojo.User; +import store.zabbix.pojo.Userlist; +import store.zabbix.service.CheckoutService; +import store.zabbix.service.UserlistService; +@Controller +@RequestMapping("/checkout") +public class CheckoutController { + @Autowired + private CheckoutService checkoutService; + @Autowired + private UserlistService userlistService; + + @RequestMapping("/getallcheckout") + public String getallcheckout(Model model ,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize){ + PageHelper.startPage(page, pageSize); + List checkout=checkoutService.getallcheckout(); + PageInfo p=new PageInfo(checkout); + model.addAttribute("p", p); + model.addAttribute("checkout", checkout); + model.addAttribute("mainPage", "checkout.jsp"); + return "admin/main1"; + } + //租客删除自己已退租列表 + @RequestMapping("/deletecheckout") + public String deletecheckout(Integer id ) { + checkoutService.deletecheckout(id); + return "redirect:/checkout/getmycheckout.action"; + } + //租客删除自己已退租列表 + @RequestMapping("/admindeletecheckout") + public String admindeletecheckout(Integer id ) { + checkoutService.deletecheckout(id); + return "redirect:/checkout/getallcheckout.action"; + } + + @RequestMapping("/getmycheckout") + public String getmycheckout(Model model,HttpSession httpSession,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize) { + User user1= (User) httpSession.getAttribute("user"); + Userlist userlist=userlistService.findhasuserlist(user1.getId()); + PageHelper.startPage(page, pageSize); + List list=userlistService.getmycheckout(userlist.getId()); + PageInfo p=new PageInfo(list); + model.addAttribute("p", p); + model.addAttribute("userlistcheck", list); + model.addAttribute("mainPage","mycheckout.jsp"); + return "zuke/main"; + } +} diff --git a/src/controller/HetongController.java b/src/main/java/store/zabbix/controller/HetongController.java similarity index 88% rename from src/controller/HetongController.java rename to src/main/java/store/zabbix/controller/HetongController.java index 24e8dfc..882db07 100644 --- a/src/controller/HetongController.java +++ b/src/main/java/store/zabbix/controller/HetongController.java @@ -1,103 +1,103 @@ -package controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; - -import Pojo.Apply; -import Pojo.Checkout; -import Pojo.Hetong; -import Pojo.Houselist; -import Pojo.Zulist; -import service.ApplyService; -import service.CheckoutService; -import service.HetongService; -import service.HouselistService; -import service.ZulistService; -@Controller -@RequestMapping("/hetong") -public class HetongController { - @Autowired - private HetongService hetongService; - @Autowired - private HouselistService houselistService; - @Autowired - private ApplyService applyService; - @Autowired - private ZulistService zulistService; - @Autowired - private CheckoutService checkoutService; - - //新增合同信息，修改房屋列表的状态，从申请列表中删除，增添到租赁列表当中 - @RequestMapping("/inserthetong") - public String inserthetong(Model model,Hetong hetong){ - //新增合同信息 - hetongService.inserthetong(hetong); - Hetong hetong1=hetongService.findhetong(hetong.getHouse_id()); - //修改房屋列表状态 - Houselist houselist=houselistService.findhouseid(hetong1.getHouse_id()); - houselist.setStatus("已租赁"); - houselistService.updatehousestatus(houselist); - //添加到租赁列表当中 - Zulist zulist=new Zulist(); - Apply apply=applyService.findbyhouse_id(hetong.getHouse_id()); - zulist.setHouse_id(hetong.getHouse_id()); - zulist.setUserlist_id(apply.getUserlist_id()); - zulist.setContract_id(hetong1.getId()); - zulist.setPrice(apply.getPrice()); - zulist.setAddress(apply.getAddress()); - zulistService.insertzulist(zulist); - //从申请列表中删除 - applyService.deletebyhouse_id(hetong1.getHouse_id()); - model.addAttribute("error", "zusuccess"); - return "redirect:/zulist/findzulist.action"; - - } - @RequestMapping("/seehetong") - public String seehetong(String house_id,Model model){ - Hetong hetong=hetongService.findhetong(house_id); - model.addAttribute("hetong", hetong); - model.addAttribute("mainPage", "hetong.jsp"); - return "admin/main1"; - } - @RequestMapping("/updatehetong") - public String updatehetong(String house_id,Model model){ - Hetong hetong=hetongService.findhetong(house_id); - model.addAttribute("hetong", hetong); - model.addAttribute("mainPage", "updatehetong.jsp"); - return "admin/main1"; - } - @RequestMapping("/changehetong") - public String changehetong(Hetong hetong){ - hetongService.updatehetong(hetong); - - return "redirect:/zulist/findzulist.action"; - } - //终止合同操作：删除合同，插入已退租列表，删除在租列表，删除房屋列表 - - @RequestMapping("/deletehetong") - public String deletehetong(String house_id,Model model){ - hetongService.deletehetong(house_id); - Zulist zulist=zulistService.findzulist(house_id); - Checkout checkout=new Checkout(); - checkout.setHouse_id(house_id); - checkout.setAddress(zulist.getAddress()); - checkout.setStatus("已退租"); - checkout.setUserlist_id(zulist.getUserlist_id()); - checkoutService.insertcheckout(checkout); - houselistService.deletehousebyhouseid(house_id); - zulistService.deletezulist(house_id); - - model.addAttribute("error", "checkoutsuccess"); - return "redirect:/zulist/findzulist.action"; - } - - @RequestMapping("/zukeseehetong") - public String zukeseehetong(String house_id,Model model){ - Hetong hetong=hetongService.findhetong(house_id); - model.addAttribute("hetong", hetong); - model.addAttribute("mainPage", "showhetong.jsp"); - return "zuke/main"; - } -} +package store.zabbix.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; + +import store.zabbix.pojo.Apply; +import store.zabbix.pojo.Checkout; +import store.zabbix.pojo.Hetong; +import store.zabbix.pojo.Houselist; +import store.zabbix.pojo.Zulist; +import store.zabbix.service.ApplyService; +import store.zabbix.service.CheckoutService; +import store.zabbix.service.HetongService; +import store.zabbix.service.HouselistService; +import store.zabbix.service.ZulistService; +@Controller +@RequestMapping("/hetong") +public class HetongController { + @Autowired + private HetongService hetongService; + @Autowired + private HouselistService houselistService; + @Autowired + private ApplyService applyService; + @Autowired + private ZulistService zulistService; + @Autowired + private CheckoutService checkoutService; + + //新增合同信息，修改房屋列表的状态，从申请列表中删除，增添到租赁列表当中 + @RequestMapping("/inserthetong") + public String inserthetong(Model model,Hetong hetong){ + //新增合同信息 + hetongService.inserthetong(hetong); + Hetong hetong1=hetongService.findhetong(hetong.getHouse_id()); + //修改房屋列表状态 + Houselist houselist=houselistService.findhouseid(hetong1.getHouse_id()); + houselist.setStatus("已租赁"); + houselistService.updatehousestatus(houselist); + //添加到租赁列表当中 + Zulist zulist=new Zulist(); + Apply apply=applyService.findbyhouse_id(hetong.getHouse_id()); + zulist.setHouse_id(hetong.getHouse_id()); + zulist.setUserlist_id(apply.getUserlist_id()); + zulist.setContract_id(hetong1.getId()); + zulist.setPrice(apply.getPrice()); + zulist.setAddress(apply.getAddress()); + zulistService.insertzulist(zulist); + //从申请列表中删除 + applyService.deletebyhouse_id(hetong1.getHouse_id()); + model.addAttribute("error", "zusuccess"); + return "redirect:/zulist/findzulist.action"; + + } + @RequestMapping("/seehetong") + public String seehetong(String house_id,Model model){ + Hetong hetong=hetongService.findhetong(house_id); + model.addAttribute("hetong", hetong); + model.addAttribute("mainPage", "hetong.jsp"); + return "admin/main1"; + } + @RequestMapping("/updatehetong") + public String updatehetong(String house_id,Model model){ + Hetong hetong=hetongService.findhetong(house_id); + model.addAttribute("hetong", hetong); + model.addAttribute("mainPage", "updatehetong.jsp"); + return "admin/main1"; + } + @RequestMapping("/changehetong") + public String changehetong(Hetong hetong){ + hetongService.updatehetong(hetong); + + return "redirect:/zulist/findzulist.action"; + } + //终止合同操作：删除合同，插入已退租列表，删除在租列表，删除房屋列表 + + @RequestMapping("/deletehetong") + public String deletehetong(String house_id,Model model){ + hetongService.deletehetong(house_id); + Zulist zulist=zulistService.findzulist(house_id); + Checkout checkout=new Checkout(); + checkout.setHouse_id(house_id); + checkout.setAddress(zulist.getAddress()); + checkout.setStatus("已退租"); + checkout.setUserlist_id(zulist.getUserlist_id()); + checkoutService.insertcheckout(checkout); + houselistService.deletehousebyhouseid(house_id); + zulistService.deletezulist(house_id); + + model.addAttribute("error", "checkoutsuccess"); + return "redirect:/zulist/findzulist.action"; + } + + @RequestMapping("/zukeseehetong") + public String zukeseehetong(String house_id,Model model){ + Hetong hetong=hetongService.findhetong(house_id); + model.addAttribute("hetong", hetong); + model.addAttribute("mainPage", "showhetong.jsp"); + return "zuke/main"; + } +} diff --git a/src/controller/HoustlistController.java b/src/main/java/store/zabbix/controller/HoustlistController.java similarity index 90% rename from src/controller/HoustlistController.java rename to src/main/java/store/zabbix/controller/HoustlistController.java index bd801d0..bece62f 100644 --- a/src/controller/HoustlistController.java +++ b/src/main/java/store/zabbix/controller/HoustlistController.java @@ -1,119 +1,116 @@ -package controller; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; - -import Pojo.Houselist; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import service.HouselistService; -import cn.itcast.utils.Page; -import Pojo.QueryVo; -@Controller - -public class HoustlistController { - @Autowired - private HouselistService houselistService; - - @RequestMapping("/houselist") - public String houselist(Model model ,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - - PageHelper.startPage(page, pageSize); - List houselist=houselistService.selectAll(); - PageInfo p=new PageInfo(houselist); - - - model.addAttribute("p", p); - model.addAttribute("houselist",houselist); - model.addAttribute("mainPage","houselist.jsp"); - return "zuke/main"; - } - @RequestMapping("/ahouselist") - public String ahouselist(Model model ,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - - PageHelper.startPage(page, pageSize); - List houselist=houselistService.selectAll(); - PageInfo p=new PageInfo(houselist); - - - model.addAttribute("p", p); - model.addAttribute("houselist",houselist); - model.addAttribute("mainPage","ahouselist.jsp"); - return "admin/main1"; - } - - @RequestMapping("/addhouse") - public String addhouse(Model model ,Houselist houselist){ - - String houseid=houselist.getHouseid(); - Houselist houselist1=houselistService.findhouseid(houseid); - if(houselist1!=null){ - model.addAttribute("error","该房屋id已存在"); - model.addAttribute("houselist",houselist); - model.addAttribute("mainPage","addhouse.jsp"); - return "admin/main1"; - }else{ - model.addAttribute("error","添加成功"); - houselistService.inserthouse(houselist); - model.addAttribute("houselist",houselist); - model.addAttribute("mainPage","addhouse.jsp"); - return "admin/main1"; - } - } - - @RequestMapping("/toaddhouse") - public String toaddhoust(Model model){ - model.addAttribute("mainPage","addhouse.jsp"); - - return "admin/main1"; - } - @RequestMapping("/deletehouse") - public String deletehouse(Integer id){ - houselistService.deletehouse(id); - - - return "redirect:ahouselist.action"; - } - @RequestMapping("/toahouselist") - public String toahouselist(){ - - - - return "ahouselist.action"; - } - @RequestMapping("/findid") - public String findid(Integer id,Model model){ - Houselist list=houselistService.findid(id); - model.addAttribute("houselist",list); - model.addAttribute("mainPage", "changehouse.jsp"); - return "admin/main1"; - } - @RequestMapping("/findhouseidupdate") - public String findhouseidupdate(Houselist houselist,Model model){ - Houselist list=houselistService.findhouseidupdate(houselist); - if(list!=null){ - model.addAttribute("houselist",houselist); - model.addAttribute("mainPage", "changehouse.jsp"); - model.addAttribute("error","该房屋id已存在"); - return "admin/main1"; - } - else{ - houselistService.updatehouse(houselist); - model.addAttribute("houselist",houselist); - model.addAttribute("mainPage", "changehouse.jsp"); - model.addAttribute("error","更新成功"); - return "admin/main1"; - } - } - -} +package store.zabbix.controller; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import store.zabbix.pojo.Houselist; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import store.zabbix.service.HouselistService; + +@Controller + +public class HoustlistController { + @Autowired + private HouselistService houselistService; + + @RequestMapping("/houselist") + public String houselist(Model model ,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize){ + + PageHelper.startPage(page, pageSize); + List houselist=houselistService.selectAll(); + PageInfo p=new PageInfo(houselist); + + + model.addAttribute("p", p); + model.addAttribute("houselist",houselist); + model.addAttribute("mainPage","houselist.jsp"); + return "zuke/main"; + } + @RequestMapping("/ahouselist") + public String ahouselist(Model model ,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize){ + + PageHelper.startPage(page, pageSize); + List houselist=houselistService.selectAll(); + PageInfo p=new PageInfo(houselist); + + + model.addAttribute("p", p); + model.addAttribute("houselist",houselist); + model.addAttribute("mainPage","ahouselist.jsp"); + return "admin/main1"; + } + + @RequestMapping("/addhouse") + public String addhouse(Model model ,Houselist houselist){ + + String houseid=houselist.getHouseid(); + Houselist houselist1=houselistService.findhouseid(houseid); + if(houselist1!=null){ + model.addAttribute("error","该房屋id已存在"); + model.addAttribute("houselist",houselist); + model.addAttribute("mainPage","addhouse.jsp"); + return "admin/main1"; + }else{ + model.addAttribute("error","添加成功"); + houselistService.inserthouse(houselist); + model.addAttribute("houselist",houselist); + model.addAttribute("mainPage","addhouse.jsp"); + return "admin/main1"; + } + } + + @RequestMapping("/toaddhouse") + public String toaddhoust(Model model){ + model.addAttribute("mainPage","addhouse.jsp"); + + return "admin/main1"; + } + @RequestMapping("/deletehouse") + public String deletehouse(Integer id){ + houselistService.deletehouse(id); + + + return "redirect:ahouselist.action"; + } + @RequestMapping("/toahouselist") + public String toahouselist(){ + + + + return "ahouselist.action"; + } + @RequestMapping("/findid") + public String findid(Integer id,Model model){ + Houselist list=houselistService.findid(id); + model.addAttribute("houselist",list); + model.addAttribute("mainPage", "changehouse.jsp"); + return "admin/main1"; + } + @RequestMapping("/findhouseidupdate") + public String findhouseidupdate(Houselist houselist,Model model){ + Houselist list=houselistService.findhouseidupdate(houselist); + if(list!=null){ + model.addAttribute("houselist",houselist); + model.addAttribute("mainPage", "changehouse.jsp"); + model.addAttribute("error","该房屋id已存在"); + return "admin/main1"; + } + else{ + houselistService.updatehouse(houselist); + model.addAttribute("houselist",houselist); + model.addAttribute("mainPage", "changehouse.jsp"); + model.addAttribute("error","更新成功"); + return "admin/main1"; + } + } + +} diff --git a/src/controller/PaidController.java b/src/main/java/store/zabbix/controller/PaidController.java similarity index 93% rename from src/controller/PaidController.java rename to src/main/java/store/zabbix/controller/PaidController.java index 56f0112..f37831e 100644 --- a/src/controller/PaidController.java +++ b/src/main/java/store/zabbix/controller/PaidController.java @@ -1,162 +1,161 @@ - -package controller; - -import java.util.List; - -import javax.servlet.http.HttpSession; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; - -import Pojo.Houselist; -import Pojo.Paid; -import Pojo.QueryVo; -import Pojo.Topaid; -import Pojo.User; -import Pojo.Userlist; -import Pojo.Zulist; -import service.PaidService; -import service.TopaidService; -import service.UserlistService; -import java.text.SimpleDateFormat; -import java.util.Date;; - -@Controller -@RequestMapping("/paid") -public class PaidController { - @Autowired - private PaidService paidService; - @Autowired - private TopaidService topaidService; - @Autowired - private UserlistService userlistService; - //管理员查找所有已缴租金列表 - @RequestMapping("/selectall") - public String selectall(Model model,QueryVo vo,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - PageHelper.startPage(page, pageSize); - List list=paidService.selectall(vo); - PageInfo p=new PageInfo(list); - Double sum=paidService.selectsum(vo); - model.addAttribute("paid", list); - model.addAttribute("sum", sum); - model.addAttribute("p", p); - model.addAttribute("mainPage", "paid.jsp"); - model.addAttribute("vo", vo); - return "admin/main1"; - } - //租客查找自己已缴租金列表 - @RequestMapping("/findmypaid") - public String findmypaid(HttpSession httpSession,Model model,QueryVo vo,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - User user1= (User) httpSession.getAttribute("user"); - Userlist userlist=userlistService.findhasuserlist(user1.getId()); - - vo.setUserlist_id(userlist.getId()); - PageHelper.startPage(page, pageSize); - List list=paidService.selectall(vo); - PageInfo p=new PageInfo(list); - Double sum=paidService.selectsum(vo); - model.addAttribute("paid", list); - model.addAttribute("sum", sum); - model.addAttribute("p", p); - model.addAttribute("mainPage", "mypaid.jsp"); - model.addAttribute("vo", vo); - return "zuke/main"; - } - //管理员删除已缴租金记录 - @RequestMapping("/deletepaid") - public String deletepaid(Integer id){ - paidService.deletepaid(id); - return "redirect:selectall.action"; - } - //zuke删除已缴租金记录 - @RequestMapping("/zukedeletepaid") - public String zukedeletepaid(Integer id){ - paidService.deletepaid(id); - return "redirect:findmypaid.action"; - } - //跳到我要收租页面 - @RequestMapping("/showaddpaid") - public String showaddpaid(Model model,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize)throws Exception{ - PageHelper.startPage(page, pageSize); - List list=paidService.findzuuserlist(); - PageInfo p=new PageInfo(list); - model.addAttribute("zulist", list); - model.addAttribute("p", p); - model.addAttribute("mainPage", "showaddpaid.jsp"); - return "admin/main1"; - } - //点击收租后跳转到添加租金信息页面 - @RequestMapping("/addpaid") - public String addpaid(Integer id,Model model){ - Zulist zulist=paidService.findzukezulist(id); - model.addAttribute("zulist", zulist); - model.addAttribute("mainPage", "addpaid.jsp"); - return "admin/main1"; - } - //添加租金信息到topaid表 - @RequestMapping("/inserttopaid") - public String inserttopaid(Topaid topaid,Model model){ - topaidService.inserttopaid(topaid); - model.addAttribute("error","inserttopaid"); - - return "redirect:showaddpaid.action"; - } - //管理员查看所有未缴租金信息 - @RequestMapping("/topaidlist") - public String topaidlist(Model model,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - QueryVo vo=new QueryVo(); - PageHelper.startPage(page, pageSize); - List list=topaidService.findtopaid(vo); - PageInfo p=new PageInfo(list); - model.addAttribute("topaid", list); - model.addAttribute("p", p); - model.addAttribute("mainPage", "topaid.jsp"); - return "admin/main1"; - } - //租客查看自己的未缴租金 - @RequestMapping("/mytopaidlist") - public String mytopaidlist(Model model,HttpSession httpSession,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - User user1= (User) httpSession.getAttribute("user"); - Userlist userlist=userlistService.findhasuserlist(user1.getId()); - QueryVo vo=new QueryVo(); - vo.setUserlist_id(userlist.getId()); - PageHelper.startPage(page, pageSize); - List topaid=topaidService.findtopaid(vo); - PageInfo p=new PageInfo(topaid); - model.addAttribute("p", p); - model.addAttribute("topaid",topaid); - model.addAttribute("mainPage", "mytopaid.jsp"); - return "zuke/main"; - } - //租客进行支付操作 - @RequestMapping("/gotopay") - public String gotopay(Integer id,Model model){ - Date dt=new Date(); - SimpleDateFormat matter1=new SimpleDateFormat("yyyy-MM-dd"); - String paydate=matter1.format(dt); - Topaid topaid=topaidService.findbyid(id); - Paid paid=new Paid(); - paid.setHouse_id(topaid.getHouse_id()); - paid.setAddress(topaid.getAddress()); - paid.setPrice(topaid.getPrice()); - paid.setDate(topaid.getDate()); - paid.setPaydate(paydate); - paid.setName(topaid.getName()); - paid.setUserlist_id(topaid.getUserlist_id()); - paid.setStatus("租金已缴"); - topaidService.gotopay(id, paid); - model.addAttribute("error", "paysucess"); - return "redirect:findmypaid.action"; - } -} + +package store.zabbix.controller; + +import java.util.List; + +import javax.servlet.http.HttpSession; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import store.zabbix.pojo.Paid; +import store.zabbix.pojo.QueryVo; +import store.zabbix.pojo.Topaid; +import store.zabbix.pojo.User; +import store.zabbix.pojo.Userlist; +import store.zabbix.pojo.Zulist; +import store.zabbix.service.PaidService; +import store.zabbix.service.TopaidService; +import store.zabbix.service.UserlistService; +import java.text.SimpleDateFormat; +import java.util.Date;; + +@Controller +@RequestMapping("/paid") +public class PaidController { + @Autowired + private PaidService paidService; + @Autowired + private TopaidService topaidService; + @Autowired + private UserlistService userlistService; + //管理员查找所有已缴租金列表 + @RequestMapping("/selectall") + public String selectall(Model model,QueryVo vo,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize){ + PageHelper.startPage(page, pageSize); + List list=paidService.selectall(vo); + PageInfo p=new PageInfo(list); + Double sum=paidService.selectsum(vo); + model.addAttribute("paid", list); + model.addAttribute("sum", sum); + model.addAttribute("p", p); + model.addAttribute("mainPage", "paid.jsp"); + model.addAttribute("vo", vo); + return "admin/main1"; + } + //租客查找自己已缴租金列表 + @RequestMapping("/findmypaid") + public String findmypaid(HttpSession httpSession,Model model,QueryVo vo,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize){ + User user1= (User) httpSession.getAttribute("user"); + Userlist userlist=userlistService.findhasuserlist(user1.getId()); + + vo.setUserlist_id(userlist.getId()); + PageHelper.startPage(page, pageSize); + List list=paidService.selectall(vo); + PageInfo p=new PageInfo(list); + Double sum=paidService.selectsum(vo); + model.addAttribute("paid", list); + model.addAttribute("sum", sum); + model.addAttribute("p", p); + model.addAttribute("mainPage", "mypaid.jsp"); + model.addAttribute("vo", vo); + return "zuke/main"; + } + //管理员删除已缴租金记录 + @RequestMapping("/deletepaid") + public String deletepaid(Integer id){ + paidService.deletepaid(id); + return "redirect:selectall.action"; + } + //zuke删除已缴租金记录 + @RequestMapping("/zukedeletepaid") + public String zukedeletepaid(Integer id){ + paidService.deletepaid(id); + return "redirect:findmypaid.action"; + } + //跳到我要收租页面 + @RequestMapping("/showaddpaid") + public String showaddpaid(Model model,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize)throws Exception{ + PageHelper.startPage(page, pageSize); + List list=paidService.findzuuserlist(); + PageInfo p=new PageInfo(list); + model.addAttribute("zulist", list); + model.addAttribute("p", p); + model.addAttribute("mainPage", "showaddpaid.jsp"); + return "admin/main1"; + } + //点击收租后跳转到添加租金信息页面 + @RequestMapping("/addpaid") + public String addpaid(Integer id,Model model){ + Zulist zulist=paidService.findzukezulist(id); + model.addAttribute("zulist", zulist); + model.addAttribute("mainPage", "addpaid.jsp"); + return "admin/main1"; + } + //添加租金信息到topaid表 + @RequestMapping("/inserttopaid") + public String inserttopaid(Topaid topaid,Model model){ + topaidService.inserttopaid(topaid); + model.addAttribute("error","inserttopaid"); + + return "redirect:showaddpaid.action"; + } + //管理员查看所有未缴租金信息 + @RequestMapping("/topaidlist") + public String topaidlist(Model model,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize){ + QueryVo vo=new QueryVo(); + PageHelper.startPage(page, pageSize); + List list=topaidService.findtopaid(vo); + PageInfo p=new PageInfo(list); + model.addAttribute("topaid", list); + model.addAttribute("p", p); + model.addAttribute("mainPage", "topaid.jsp"); + return "admin/main1"; + } + //租客查看自己的未缴租金 + @RequestMapping("/mytopaidlist") + public String mytopaidlist(Model model,HttpSession httpSession,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize){ + User user1= (User) httpSession.getAttribute("user"); + Userlist userlist=userlistService.findhasuserlist(user1.getId()); + QueryVo vo=new QueryVo(); + vo.setUserlist_id(userlist.getId()); + PageHelper.startPage(page, pageSize); + List topaid=topaidService.findtopaid(vo); + PageInfo p=new PageInfo(topaid); + model.addAttribute("p", p); + model.addAttribute("topaid",topaid); + model.addAttribute("mainPage", "mytopaid.jsp"); + return "zuke/main"; + } + //租客进行支付操作 + @RequestMapping("/gotopay") + public String gotopay(Integer id,Model model){ + Date dt=new Date(); + SimpleDateFormat matter1=new SimpleDateFormat("yyyy-MM-dd"); + String paydate=matter1.format(dt); + Topaid topaid=topaidService.findbyid(id); + Paid paid=new Paid(); + paid.setHouse_id(topaid.getHouse_id()); + paid.setAddress(topaid.getAddress()); + paid.setPrice(topaid.getPrice()); + paid.setDate(topaid.getDate()); + paid.setPaydate(paydate); + paid.setName(topaid.getName()); + paid.setUserlist_id(topaid.getUserlist_id()); + paid.setStatus("租金已缴"); + topaidService.gotopay(id, paid); + model.addAttribute("error", "paysucess"); + return "redirect:findmypaid.action"; + } +} diff --git a/src/controller/ScheduleController.java b/src/main/java/store/zabbix/controller/ScheduleController.java similarity index 92% rename from src/controller/ScheduleController.java rename to src/main/java/store/zabbix/controller/ScheduleController.java index fb18cba..46ccbe5 100644 --- a/src/controller/ScheduleController.java +++ b/src/main/java/store/zabbix/controller/ScheduleController.java @@ -1,73 +1,72 @@ -package controller; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; - -import Pojo.Houselist; -import Pojo.Schedule; -import service.ScheduleService; - -@Controller -@RequestMapping("/schedule") -public class ScheduleController { - @Autowired - private ScheduleService scheduleService; - - @RequestMapping("/selectAll") - public String selectAll(Model model ,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - PageHelper.startPage(page, pageSize); - List schedule=scheduleService.selectAll(); - PageInfo p=new PageInfo(schedule); - model.addAttribute("schedule", schedule); - model.addAttribute("p", p); - model.addAttribute("mainPage", "schedule.jsp"); - return "admin/main1"; - } - @RequestMapping("/deleteschedule") - public String deleteschedule(Integer id){ - scheduleService.deleteschedule(id); - return "redirect:selectAll.action"; - } - @RequestMapping("/insertschedule") - public String insertschedule(Schedule schedule,Model model){ - scheduleService.insertschedule(schedule); - - return "redirect:selectAll.action"; - - } - @RequestMapping("/updateschedule") - public String updateschedule(Schedule schedule,Model model){ - scheduleService.updateschedule(schedule); - model.addAttribute("error", "更新成功"); - model.addAttribute("schedule", schedule); - model.addAttribute("mainPage", "updateschedule.jsp"); - return "admin/main1"; - - } - @RequestMapping("/toinsert") - public String toinsert(Model model){ - model.addAttribute("mainPage", "addschedule.jsp"); - - return "admin/main1"; - - } - @RequestMapping("/toupdate") - public String toupdate(Model model,Integer id){ - Schedule schedule=scheduleService.selectbyid(id); - model.addAttribute("schedule", schedule); - - model.addAttribute("mainPage", "updateschedule.jsp"); - - return "admin/main1"; - - } -} +package store.zabbix.controller; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import store.zabbix.pojo.Schedule; +import store.zabbix.service.ScheduleService; + +@Controller +@RequestMapping("/schedule") +public class ScheduleController { + @Autowired + private ScheduleService scheduleService; + + @RequestMapping("/selectAll") + public String selectAll(Model model ,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize){ + PageHelper.startPage(page, pageSize); + List schedule=scheduleService.selectAll(); + PageInfo p=new PageInfo(schedule); + model.addAttribute("schedule", schedule); + model.addAttribute("p", p); + model.addAttribute("mainPage", "schedule.jsp"); + return "admin/main1"; + } + @RequestMapping("/deleteschedule") + public String deleteschedule(Integer id){ + scheduleService.deleteschedule(id); + return "redirect:selectAll.action"; + } + @RequestMapping("/insertschedule") + public String insertschedule(Schedule schedule,Model model){ + scheduleService.insertschedule(schedule); + + return "redirect:selectAll.action"; + + } + @RequestMapping("/updateschedule") + public String updateschedule(Schedule schedule,Model model){ + scheduleService.updateschedule(schedule); + model.addAttribute("error", "更新成功"); + model.addAttribute("schedule", schedule); + model.addAttribute("mainPage", "updateschedule.jsp"); + return "admin/main1"; + + } + @RequestMapping("/toinsert") + public String toinsert(Model model){ + model.addAttribute("mainPage", "addschedule.jsp"); + + return "admin/main1"; + + } + @RequestMapping("/toupdate") + public String toupdate(Model model,Integer id){ + Schedule schedule=scheduleService.selectbyid(id); + model.addAttribute("schedule", schedule); + + model.addAttribute("mainPage", "updateschedule.jsp"); + + return "admin/main1"; + + } +} diff --git a/src/main/java/store/zabbix/controller/UserController.java b/src/main/java/store/zabbix/controller/UserController.java new file mode 100644 index 0000000..864a8ed --- /dev/null +++ b/src/main/java/store/zabbix/controller/UserController.java @@ -0,0 +1,54 @@ +package store.zabbix.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import store.zabbix.pojo.User; +import store.zabbix.service.UserService; + +import javax.servlet.http.HttpSession; + +@Controller + +public class UserController { + + @Autowired + private UserService userService; + + @RequestMapping("/login") + public String userList() throws Exception { + + + return "login"; + + } + + @RequestMapping("/logincheck") + public String login(User user, Model model, HttpSession httpSession) throws Exception { + + User user1 = userService.login(user); + + if (user1 != null) { + + httpSession.setAttribute("user", user1); + if (user1.getType().equals("zuke")) { + return "zuke/main"; + } else { + return "admin/main1"; + } + } else { + String error = "error"; + model.addAttribute("error", error); + return "login"; + } + } + + @RequestMapping("/toindex") + public String toindex(Model model) throws Exception { + + + return "admin/index"; + } +} + diff --git a/src/controller/UserlistController.java b/src/main/java/store/zabbix/controller/UserlistController.java similarity index 93% rename from src/controller/UserlistController.java rename to src/main/java/store/zabbix/controller/UserlistController.java index 750aee1..eddb90c 100644 --- a/src/controller/UserlistController.java +++ b/src/main/java/store/zabbix/controller/UserlistController.java @@ -1,99 +1,98 @@ -package controller; - -import java.util.List; - -import javax.servlet.http.HttpSession; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import Pojo.Houselist; -import Pojo.User; -import Pojo.Userlist; -import service.UserlistService; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -@Controller -public class UserlistController { - - @Autowired - private UserlistService userlistService; - - - @RequestMapping("/findhasuserlist") - public String findhasuserlist(HttpSession httpSession,Model model) throws Exception{ - User user1= (User) httpSession.getAttribute("user"); - Integer user_id=user1.getId(); - Userlist userlist=userlistService.findhasuserlist(user_id); - model.addAttribute("userlist", userlist); - model.addAttribute("mainPage", "updateuserlist.jsp"); - return "zuke/main"; - - } - //查找并更新用户信息 - @RequestMapping("/checkuserlist") - public String checkuserlist(Model model,Userlist userlist,HttpSession httpSession) throws Exception{ - if(userlist.getId()==null){ - String idcard=userlist.getIdcard(); - Userlist list=userlistService.checkuserlist(idcard); - - if(list!=null){ - model.addAttribute("error", "该身份证已被绑定,一个身份证号码只能被一个账户绑定！"); - model.addAttribute("mainPage", "updateuserlist.jsp"); - model.addAttribute("userlist", userlist); - }else{ - User user1= (User) httpSession.getAttribute("user"); - Integer user_id=user1.getId(); - userlist.setUser_id(user_id); - userlistService.insertuserlist(userlist); - Userlist list1=userlistService.checkuserlist(idcard); - model.addAttribute("error", "资料完善成功"); - model.addAttribute("mainPage", "updateuserlist.jsp"); - model.addAttribute("userlist", list1); - } - - - - } - else{ - - Userlist list=userlistService.finduserlistupdate(userlist); - if(list!=null){ - model.addAttribute("error", "该身份证号码已被绑定"); - model.addAttribute("mainPage", "updateuserlist.jsp"); - model.addAttribute("userlist", userlist); - }else{ - userlistService.updateuserlist(userlist); - model.addAttribute("error", "更新成功"); - model.addAttribute("mainPage", "updateuserlist.jsp"); - model.addAttribute("userlist", userlist); - } - - } - return "zuke/main"; - } - - @RequestMapping("/findalluserlist") - public String findalluserlist(Model model ,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize) { - PageHelper.startPage(page, pageSize); - List userlist=userlistService.findalluserlist(); - PageInfo p=new PageInfo(userlist); - model.addAttribute("userlist", userlist); - model.addAttribute("p", p); - model.addAttribute("mainPage", "userlist.jsp"); - return "admin/main1"; - - } - //删除用户信息 - @RequestMapping("/deleteuserlist") - public String deleteuserlist(Model model,Integer id) { - userlistService.deleteuserlist(id); - model.addAttribute("error", "deletesuccess"); - return "redirect:findalluserlist.action"; - } -} +package store.zabbix.controller; + +import java.util.List; + +import javax.servlet.http.HttpSession; + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import store.zabbix.pojo.User; +import store.zabbix.pojo.Userlist; +import store.zabbix.service.UserlistService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +@Controller +public class UserlistController { + + @Autowired + private UserlistService userlistService; + + + @RequestMapping("/findhasuserlist") + public String findhasuserlist(HttpSession httpSession,Model model) throws Exception{ + User user1= (User) httpSession.getAttribute("user"); + Integer user_id=user1.getId(); + Userlist userlist=userlistService.findhasuserlist(user_id); + model.addAttribute("userlist", userlist); + model.addAttribute("mainPage", "updateuserlist.jsp"); + return "zuke/main"; + + } + //查找并更新用户信息 + @RequestMapping("/checkuserlist") + public String checkuserlist(Model model,Userlist userlist,HttpSession httpSession) throws Exception{ + if(userlist.getId()==null){ + String idcard=userlist.getIdcard(); + Userlist list=userlistService.checkuserlist(idcard); + + if(list!=null){ + model.addAttribute("error", "该身份证已被绑定,一个身份证号码只能被一个账户绑定！"); + model.addAttribute("mainPage", "updateuserlist.jsp"); + model.addAttribute("userlist", userlist); + }else{ + User user1= (User) httpSession.getAttribute("user"); + Integer user_id=user1.getId(); + userlist.setUser_id(user_id); + userlistService.insertuserlist(userlist); + Userlist list1=userlistService.checkuserlist(idcard); + model.addAttribute("error", "资料完善成功"); + model.addAttribute("mainPage", "updateuserlist.jsp"); + model.addAttribute("userlist", list1); + } + + + + } + else{ + + Userlist list=userlistService.finduserlistupdate(userlist); + if(list!=null){ + model.addAttribute("error", "该身份证号码已被绑定"); + model.addAttribute("mainPage", "updateuserlist.jsp"); + model.addAttribute("userlist", userlist); + }else{ + userlistService.updateuserlist(userlist); + model.addAttribute("error", "更新成功"); + model.addAttribute("mainPage", "updateuserlist.jsp"); + model.addAttribute("userlist", userlist); + } + + } + return "zuke/main"; + } + + @RequestMapping("/findalluserlist") + public String findalluserlist(Model model ,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize) { + PageHelper.startPage(page, pageSize); + List userlist=userlistService.findalluserlist(); + PageInfo p=new PageInfo(userlist); + model.addAttribute("userlist", userlist); + model.addAttribute("p", p); + model.addAttribute("mainPage", "userlist.jsp"); + return "admin/main1"; + + } + //删除用户信息 + @RequestMapping("/deleteuserlist") + public String deleteuserlist(Model model,Integer id) { + userlistService.deleteuserlist(id); + model.addAttribute("error", "deletesuccess"); + return "redirect:findalluserlist.action"; + } +} diff --git a/src/controller/WrongController.java b/src/main/java/store/zabbix/controller/WrongController.java similarity index 91% rename from src/controller/WrongController.java rename to src/main/java/store/zabbix/controller/WrongController.java index ed42a28..9749e8f 100644 --- a/src/controller/WrongController.java +++ b/src/main/java/store/zabbix/controller/WrongController.java @@ -1,163 +1,159 @@ -package controller; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpSession; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; - -import Pojo.Paid; -import Pojo.QueryVo; -import Pojo.Solve; -import Pojo.Topaid; -import Pojo.User; -import Pojo.Userlist; -import Pojo.Wrong; -import Pojo.Zulist; -import service.PaidService; -import service.SolveService; -import service.UserlistService; -import service.ZulistService; - -@Controller -@RequestMapping("/wrong") -public class WrongController { - @Autowired - private SolveService solveService; - @Autowired - private UserlistService userlistService; - @Autowired - private PaidService paidService; - @Autowired - private ZulistService zulistService; - //管理员查找所有已处理的报障 - @RequestMapping("/selectall") - public String selectall(Model model,QueryVo vo,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - PageHelper.startPage(page, pageSize); - List list=solveService.selectall(vo); - PageInfo p=new PageInfo(list); - Integer count=solveService.selectcount(vo); - model.addAttribute("solve", list); - model.addAttribute("count", count); - model.addAttribute("p", p); - model.addAttribute("mainPage", "solve.jsp"); - model.addAttribute("vo", vo); - return "admin/main1"; - } -//租客查找自己已处理的报障 - @RequestMapping("/findmysolve") - public String findmysolve(HttpSession httpSession,Model model,QueryVo vo,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - User user1= (User) httpSession.getAttribute("user"); - Userlist userlist=userlistService.findhasuserlist(user1.getId()); - - vo.setUserlist_id(userlist.getId()); - PageHelper.startPage(page, pageSize); - List list=solveService.selectall(vo); - PageInfo p=new PageInfo(list); - Integer count=solveService.selectcount(vo); - model.addAttribute("solve", list); - model.addAttribute("count", count); - model.addAttribute("p", p); - model.addAttribute("mainPage", "mysolve.jsp"); - model.addAttribute("vo", vo); - return "zuke/main"; - } - //管理员删除已处理报障记录 - @RequestMapping("/deletesolve") - public String deletesolve(Integer id){ - solveService.deletesolve(id); - return "redirect:selectall.action"; - } - //zuke删除自己的已处理报障记录 - @RequestMapping("/zukedeletesolve") - public String zukedeletesolve(Integer id){ - solveService.deletesolve(id); - return "redirect:findmypaid.action"; - } - //租客跳到我要报障页面 - @RequestMapping("/showaddwrong") - public String showaddwrong(HttpSession httpSession,Model model,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize)throws Exception{ - User user1= (User) httpSession.getAttribute("user"); - Userlist userlist=userlistService.findhasuserlist(user1.getId()); - PageHelper.startPage(page, pageSize); - List list=zulistService.findzulistbyuid(userlist.getId()); - PageInfo p=new PageInfo(list); - model.addAttribute("zulist", list); - model.addAttribute("p", p); - model.addAttribute("mainPage", "showaddwrong.jsp"); - return "zuke/main"; - } - //点击报障后跳转到添加报障信息页面 - @RequestMapping("/addwrong") - public String addwrong(Integer id,Model model){ - Zulist zulist=paidService.findzukezulist(id); - model.addAttribute("zulist", zulist); - model.addAttribute("mainPage", "addwrong.jsp"); - return "zuke/main"; - } - //添加报障信息到wrong表 - @RequestMapping("/insertwrong") - public String insertwrong(Wrong wrong,Model model){ - solveService.insertwrong(wrong); - model.addAttribute("error","insertwrong"); - - return "redirect:showaddwrong.action"; - } - //管理员查看所有未处理报障 - @RequestMapping("/wronglist") - public String wronglist(Model model,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - QueryVo vo=new QueryVo(); - PageHelper.startPage(page, pageSize); - List list=solveService.findwrong(vo); - PageInfo p=new PageInfo(list); - model.addAttribute("wrong", list); - model.addAttribute("p", p); - model.addAttribute("mainPage", "wrong.jsp"); - return "admin/main1"; - } - //租客查看自己的未处理报障 - @RequestMapping("/mywronglist") - public String mywronglist(Model model,HttpSession httpSession,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize){ - User user1= (User) httpSession.getAttribute("user"); - Userlist userlist=userlistService.findhasuserlist(user1.getId()); - QueryVo vo=new QueryVo(); - vo.setUserlist_id(userlist.getId()); - PageHelper.startPage(page, pageSize); - List list=solveService.findwrong(vo); - PageInfo p=new PageInfo(list); - model.addAttribute("p", p); - model.addAttribute("wrong",list); - model.addAttribute("mainPage", "mywrong.jsp"); - return "zuke/main"; - } - //管理员处理报障 - @RequestMapping("/gotosolve") - public String gotosolve(Integer id,Model model){ - - Wrong wrong=solveService.findbyid(id); - Solve solve=new Solve(); - solve.setHouse_id(wrong.getHouse_id()); - solve.setAddress(wrong.getAddress()); - solve.setDate(wrong.getDate()); - solve.setDetail(wrong.getDetail()); - solve.setName(wrong.getName()); - solve.setUserlist_id(wrong.getUserlist_id()); - solve.setStatus("已处理"); - solveService.gotosolve(id, solve); - model.addAttribute("error", "duesucess"); - return "redirect:selectall.action"; - } -} +package store.zabbix.controller; +import java.util.List; + +import javax.servlet.http.HttpSession; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import store.zabbix.pojo.QueryVo; +import store.zabbix.pojo.Solve; +import store.zabbix.pojo.User; +import store.zabbix.pojo.Userlist; +import store.zabbix.pojo.Wrong; +import store.zabbix.pojo.Zulist; +import store.zabbix.service.PaidService; +import store.zabbix.service.SolveService; +import store.zabbix.service.UserlistService; +import store.zabbix.service.ZulistService; + +@Controller +@RequestMapping("/wrong") +public class WrongController { + @Autowired + private SolveService solveService; + @Autowired + private UserlistService userlistService; + @Autowired + private PaidService paidService; + @Autowired + private ZulistService zulistService; + //管理员查找所有已处理的报障 + @RequestMapping("/selectall") + public String selectall(Model model,QueryVo vo,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize){ + PageHelper.startPage(page, pageSize); + List list=solveService.selectall(vo); + PageInfo p=new PageInfo(list); + Integer count=solveService.selectcount(vo); + model.addAttribute("solve", list); + model.addAttribute("count", count); + model.addAttribute("p", p); + model.addAttribute("mainPage", "solve.jsp"); + model.addAttribute("vo", vo); + return "admin/main1"; + } +//租客查找自己已处理的报障 + @RequestMapping("/findmysolve") + public String findmysolve(HttpSession httpSession,Model model,QueryVo vo,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize){ + User user1= (User) httpSession.getAttribute("user"); + Userlist userlist=userlistService.findhasuserlist(user1.getId()); + + vo.setUserlist_id(userlist.getId()); + PageHelper.startPage(page, pageSize); + List list=solveService.selectall(vo); + PageInfo p=new PageInfo(list); + Integer count=solveService.selectcount(vo); + model.addAttribute("solve", list); + model.addAttribute("count", count); + model.addAttribute("p", p); + model.addAttribute("mainPage", "mysolve.jsp"); + model.addAttribute("vo", vo); + return "zuke/main"; + } + //管理员删除已处理报障记录 + @RequestMapping("/deletesolve") + public String deletesolve(Integer id){ + solveService.deletesolve(id); + return "redirect:selectall.action"; + } + //zuke删除自己的已处理报障记录 + @RequestMapping("/zukedeletesolve") + public String zukedeletesolve(Integer id){ + solveService.deletesolve(id); + return "redirect:findmypaid.action"; + } + //租客跳到我要报障页面 + @RequestMapping("/showaddwrong") + public String showaddwrong(HttpSession httpSession,Model model,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize)throws Exception{ + User user1= (User) httpSession.getAttribute("user"); + Userlist userlist=userlistService.findhasuserlist(user1.getId()); + PageHelper.startPage(page, pageSize); + List list=zulistService.findzulistbyuid(userlist.getId()); + PageInfo p=new PageInfo(list); + model.addAttribute("zulist", list); + model.addAttribute("p", p); + model.addAttribute("mainPage", "showaddwrong.jsp"); + return "zuke/main"; + } + //点击报障后跳转到添加报障信息页面 + @RequestMapping("/addwrong") + public String addwrong(Integer id,Model model){ + Zulist zulist=paidService.findzukezulist(id); + model.addAttribute("zulist", zulist); + model.addAttribute("mainPage", "addwrong.jsp"); + return "zuke/main"; + } + //添加报障信息到wrong表 + @RequestMapping("/insertwrong") + public String insertwrong(Wrong wrong,Model model){ + solveService.insertwrong(wrong); + model.addAttribute("error","insertwrong"); + + return "redirect:showaddwrong.action"; + } + //管理员查看所有未处理报障 + @RequestMapping("/wronglist") + public String wronglist(Model model,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize){ + QueryVo vo=new QueryVo(); + PageHelper.startPage(page, pageSize); + List list=solveService.findwrong(vo); + PageInfo p=new PageInfo(list); + model.addAttribute("wrong", list); + model.addAttribute("p", p); + model.addAttribute("mainPage", "wrong.jsp"); + return "admin/main1"; + } + //租客查看自己的未处理报障 + @RequestMapping("/mywronglist") + public String mywronglist(Model model,HttpSession httpSession,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize){ + User user1= (User) httpSession.getAttribute("user"); + Userlist userlist=userlistService.findhasuserlist(user1.getId()); + QueryVo vo=new QueryVo(); + vo.setUserlist_id(userlist.getId()); + PageHelper.startPage(page, pageSize); + List list=solveService.findwrong(vo); + PageInfo p=new PageInfo(list); + model.addAttribute("p", p); + model.addAttribute("wrong",list); + model.addAttribute("mainPage", "mywrong.jsp"); + return "zuke/main"; + } + //管理员处理报障 + @RequestMapping("/gotosolve") + public String gotosolve(Integer id,Model model){ + + Wrong wrong=solveService.findbyid(id); + Solve solve=new Solve(); + solve.setHouse_id(wrong.getHouse_id()); + solve.setAddress(wrong.getAddress()); + solve.setDate(wrong.getDate()); + solve.setDetail(wrong.getDetail()); + solve.setName(wrong.getName()); + solve.setUserlist_id(wrong.getUserlist_id()); + solve.setStatus("已处理"); + solveService.gotosolve(id, solve); + model.addAttribute("error", "duesucess"); + return "redirect:selectall.action"; + } +} diff --git a/src/controller/ZulistController.java b/src/main/java/store/zabbix/controller/ZulistController.java similarity index 87% rename from src/controller/ZulistController.java rename to src/main/java/store/zabbix/controller/ZulistController.java index 7d8db20..6b16709 100644 --- a/src/controller/ZulistController.java +++ b/src/main/java/store/zabbix/controller/ZulistController.java @@ -1,72 +1,70 @@ -package controller; - -import java.util.List; - -import javax.servlet.http.HttpSession; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import com.fasterxml.jackson.databind.util.JSONPObject; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; - -import Pojo.Apply; -import Pojo.Hetong; -import Pojo.User; -import Pojo.Userlist; -import Pojo.Zulist; -import service.UserlistService; -import service.ZulistService; - -@Controller -@RequestMapping("/zulist") -public class ZulistController { - @Autowired - private ZulistService zulistService; - @Autowired - private UserlistService userlistService; - //跳到增添合同的页面 - @RequestMapping("/toaddhetong") - public String toaddhetong(Model model,String house_id){ - Hetong hetong=new Hetong(); - hetong.setHouse_id(house_id); - model.addAttribute("hetong", hetong); - model.addAttribute("mainPage", "addhetong.jsp"); - - return "admin/main1"; - } - //管理员查看所有在租列表 - @RequestMapping("/findzulist") - public String findzulist(Model model,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize) throws Exception{ - PageHelper.startPage(page, pageSize); - List zulist=zulistService.findzuuserlist(); - PageInfo p=new PageInfo(zulist); - model.addAttribute("p", p); - model.addAttribute("zulist", zulist); - model.addAttribute("mainPage", "zulist.jsp"); - return "admin/main1"; - } - - //查看我的在租列表 - @RequestMapping("/myzulist") - public String myzulist(Model model,HttpSession httpSession,@RequestParam(required=false,defaultValue="1") Integer page, - @RequestParam(required=false,defaultValue="2") Integer pageSize) throws Exception{ - - User user1= (User) httpSession.getAttribute("user"); - Userlist userlist=userlistService.findhasuserlist(user1.getId()); - PageHelper.startPage(page, pageSize); - List list=userlistService.getUserzuList(userlist.getId()); - PageInfo p=new PageInfo(list); - model.addAttribute("userlistzu", list); - model.addAttribute("p", p); - model.addAttribute("mainPage", "myzulist.jsp"); - - return "zuke/main"; - } - -} +package store.zabbix.controller; + +import java.util.List; + +import javax.servlet.http.HttpSession; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import store.zabbix.pojo.Hetong; +import store.zabbix.pojo.User; +import store.zabbix.pojo.Userlist; +import store.zabbix.pojo.Zulist; +import store.zabbix.service.UserlistService; +import store.zabbix.service.ZulistService; + +@Controller +@RequestMapping("/zulist") +public class ZulistController { + @Autowired + private ZulistService zulistService; + @Autowired + private UserlistService userlistService; + //跳到增添合同的页面 + @RequestMapping("/toaddhetong") + public String toaddhetong(Model model,String house_id){ + Hetong hetong=new Hetong(); + hetong.setHouse_id(house_id); + model.addAttribute("hetong", hetong); + model.addAttribute("mainPage", "addhetong.jsp"); + + return "admin/main1"; + } + //管理员查看所有在租列表 + @RequestMapping("/findzulist") + public String findzulist(Model model,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize) throws Exception{ + PageHelper.startPage(page, pageSize); + List zulist=zulistService.findzuuserlist(); + PageInfo p=new PageInfo(zulist); + model.addAttribute("p", p); + model.addAttribute("zulist", zulist); + model.addAttribute("mainPage", "zulist.jsp"); + return "admin/main1"; + } + + //查看我的在租列表 + @RequestMapping("/myzulist") + public String myzulist(Model model,HttpSession httpSession,@RequestParam(required=false,defaultValue="1") Integer page, + @RequestParam(required=false,defaultValue="2") Integer pageSize) throws Exception{ + + User user1= (User) httpSession.getAttribute("user"); + Userlist userlist=userlistService.findhasuserlist(user1.getId()); + PageHelper.startPage(page, pageSize); + List list=userlistService.getUserzuList(userlist.getId()); + PageInfo p=new PageInfo(list); + model.addAttribute("userlistzu", list); + model.addAttribute("p", p); + model.addAttribute("mainPage", "myzulist.jsp"); + + return "zuke/main"; + } + +} diff --git a/src/dao/ApplyMapper.java b/src/main/java/store/zabbix/dao/ApplyMapper.java similarity index 75% rename from src/dao/ApplyMapper.java rename to src/main/java/store/zabbix/dao/ApplyMapper.java index ce658a6..43b20b7 100644 --- a/src/dao/ApplyMapper.java +++ b/src/main/java/store/zabbix/dao/ApplyMapper.java @@ -1,14 +1,14 @@ -package dao; - -import java.util.List; - -import Pojo.Apply; -import Pojo.Applyout; - -public interface ApplyMapper { - void insertapply(Apply apply); - public List findapplylist() throws Exception; - Apply findbyhouse_id(String house_id); - public void deletebyhouse_id(String house_id); - public void updateapplyout(Applyout applyout); -} +package store.zabbix.dao; + +import java.util.List; + +import store.zabbix.pojo.Apply; +import store.zabbix.pojo.Applyout; + +public interface ApplyMapper { + void insertapply(Apply apply); + public List findapplylist() throws Exception; + Apply findbyhouse_id(String house_id); + public void deletebyhouse_id(String house_id); + public void updateapplyout(Applyout applyout); +} diff --git a/src/dao/ApplyoutMapper.java b/src/main/java/store/zabbix/dao/ApplyoutMapper.java similarity index 84% rename from src/dao/ApplyoutMapper.java rename to src/main/java/store/zabbix/dao/ApplyoutMapper.java index 2b6642c..2e8a7cc 100644 --- a/src/dao/ApplyoutMapper.java +++ b/src/main/java/store/zabbix/dao/ApplyoutMapper.java @@ -1,14 +1,14 @@ -package dao; - -import java.util.List; - -import Pojo.Applyout; - -public interface ApplyoutMapper { - public void insertapplyout(Applyout applyout); - List findallapplyout(); - public void updateapplyout(Applyout applyout); - public void updateapplyoutbyhouse(Applyout applyout); - public Applyout findbyid(Integer id); - public void deleteapplyout(Integer id); -} +package store.zabbix.dao; + +import java.util.List; + +import store.zabbix.pojo.Applyout; + +public interface ApplyoutMapper { + public void insertapplyout(Applyout applyout); + List findallapplyout(); + public void updateapplyout(Applyout applyout); + public void updateapplyoutbyhouse(Applyout applyout); + public Applyout findbyid(Integer id); + public void deleteapplyout(Integer id); +} diff --git a/src/dao/CheckoutMapper.java b/src/main/java/store/zabbix/dao/CheckoutMapper.java similarity index 75% rename from src/dao/CheckoutMapper.java rename to src/main/java/store/zabbix/dao/CheckoutMapper.java index 3da74a0..1483608 100644 --- a/src/dao/CheckoutMapper.java +++ b/src/main/java/store/zabbix/dao/CheckoutMapper.java @@ -1,11 +1,11 @@ -package dao; - -import java.util.List; - -import Pojo.Checkout; - -public interface CheckoutMapper { - public void insertcheckout(Checkout checkout); - public List getallcheckout(); - public void deletecheckout(Integer id); -} +package store.zabbix.dao; + +import java.util.List; + +import store.zabbix.pojo.Checkout; + +public interface CheckoutMapper { + public void insertcheckout(Checkout checkout); + public List getallcheckout(); + public void deletecheckout(Integer id); +} diff --git a/src/dao/HetongMapper.java b/src/main/java/store/zabbix/dao/HetongMapper.java similarity index 78% rename from src/dao/HetongMapper.java rename to src/main/java/store/zabbix/dao/HetongMapper.java index d019a35..b1127f1 100644 --- a/src/dao/HetongMapper.java +++ b/src/main/java/store/zabbix/dao/HetongMapper.java @@ -1,11 +1,11 @@ -package dao; - -import Pojo.Hetong; - -public interface HetongMapper { - - public void inserthetong(Hetong hetong); - public Hetong findhetong(String house_id); - public void updatehetong(Hetong hetong); - public void deletehetong(String house_id); -} +package store.zabbix.dao; + +import store.zabbix.pojo.Hetong; + +public interface HetongMapper { + + public void inserthetong(Hetong hetong); + public Hetong findhetong(String house_id); + public void updatehetong(Hetong hetong); + public void deletehetong(String house_id); +} diff --git a/src/dao/HouselistMapper.java b/src/main/java/store/zabbix/dao/HouselistMapper.java similarity index 84% rename from src/dao/HouselistMapper.java rename to src/main/java/store/zabbix/dao/HouselistMapper.java index 61c1627..1ad550a 100644 --- a/src/dao/HouselistMapper.java +++ b/src/main/java/store/zabbix/dao/HouselistMapper.java @@ -1,20 +1,20 @@ -package dao; - -import java.util.List; - -import Pojo.Houselist; -import Pojo.QueryVo; - -public interface HouselistMapper { -List selectAll(); -public Integer findhouselistByVoCount(QueryVo vo); -Houselist findhouseid(String houseid); -void inserthouse(Houselist houselist); -void deletehouse(int id); -Houselist findid(int id); -Houselist findhouseidupdate(Houselist houselist); -void updatehouse(Houselist houselist); -void updatehousestatus(Houselist houselist); -public void deletehousebyhouseid(String house_id); -public void updatestatus(Houselist houselist); -} +package store.zabbix.dao; + +import java.util.List; + +import store.zabbix.pojo.Houselist; +import store.zabbix.pojo.QueryVo; + +public interface HouselistMapper { +List selectAll(); +public Integer findhouselistByVoCount(QueryVo vo); +Houselist findhouseid(String houseid); +void inserthouse(Houselist houselist); +void deletehouse(int id); +Houselist findid(int id); +Houselist findhouseidupdate(Houselist houselist); +void updatehouse(Houselist houselist); +void updatehousestatus(Houselist houselist); +public void deletehousebyhouseid(String house_id); +public void updatestatus(Houselist houselist); +} diff --git a/src/dao/PaidMapper.java b/src/main/java/store/zabbix/dao/PaidMapper.java similarity index 69% rename from src/dao/PaidMapper.java rename to src/main/java/store/zabbix/dao/PaidMapper.java index 04084ad..9efb088 100644 --- a/src/dao/PaidMapper.java +++ b/src/main/java/store/zabbix/dao/PaidMapper.java @@ -1,13 +1,13 @@ -package dao; - -import java.util.List; - -import Pojo.Paid; -import Pojo.QueryVo; - -public interface PaidMapper { -public List selectall(QueryVo vo); -public Double selectsum(QueryVo vo); -public void deletepaid(Integer id); -public void insertpaid(Paid paid); -} +package store.zabbix.dao; + +import java.util.List; + +import store.zabbix.pojo.Paid; +import store.zabbix.pojo.QueryVo; + +public interface PaidMapper { +public List selectall(QueryVo vo); +public Double selectsum(QueryVo vo); +public void deletepaid(Integer id); +public void insertpaid(Paid paid); +} diff --git a/src/dao/ScheduleMapper.java b/src/main/java/store/zabbix/dao/ScheduleMapper.java similarity index 81% rename from src/dao/ScheduleMapper.java rename to src/main/java/store/zabbix/dao/ScheduleMapper.java index 92f90b1..2b0d36f 100644 --- a/src/dao/ScheduleMapper.java +++ b/src/main/java/store/zabbix/dao/ScheduleMapper.java @@ -1,13 +1,13 @@ -package dao; - -import java.util.List; - -import Pojo.Schedule; - -public interface ScheduleMapper { - public void insertschedule(Schedule schedule); - public List selectAll(); - public void deleteschedule(Integer id); - public void updateschedule(Schedule schedule); - public Schedule selectbyid(Integer id); -} +package store.zabbix.dao; + +import java.util.List; + +import store.zabbix.pojo.Schedule; + +public interface ScheduleMapper { + public void insertschedule(Schedule schedule); + public List selectAll(); + public void deleteschedule(Integer id); + public void updateschedule(Schedule schedule); + public Schedule selectbyid(Integer id); +} diff --git a/src/dao/SolveMapper.java b/src/main/java/store/zabbix/dao/SolveMapper.java similarity index 70% rename from src/dao/SolveMapper.java rename to src/main/java/store/zabbix/dao/SolveMapper.java index 5ad3c55..446fdc7 100644 --- a/src/dao/SolveMapper.java +++ b/src/main/java/store/zabbix/dao/SolveMapper.java @@ -1,13 +1,13 @@ -package dao; - -import java.util.List; - -import Pojo.QueryVo; -import Pojo.Solve; - -public interface SolveMapper { - public List selectall(QueryVo vo); - public Integer selectcount(QueryVo vo); - public void deletesolve(Integer id); - public void insertsolve(Solve solve); -} +package store.zabbix.dao; + +import java.util.List; + +import store.zabbix.pojo.QueryVo; +import store.zabbix.pojo.Solve; + +public interface SolveMapper { + public List selectall(QueryVo vo); + public Integer selectcount(QueryVo vo); + public void deletesolve(Integer id); + public void insertsolve(Solve solve); +} diff --git a/src/dao/TopaidMapper.java b/src/main/java/store/zabbix/dao/TopaidMapper.java similarity index 70% rename from src/dao/TopaidMapper.java rename to src/main/java/store/zabbix/dao/TopaidMapper.java index fbab5a8..9f78899 100644 --- a/src/dao/TopaidMapper.java +++ b/src/main/java/store/zabbix/dao/TopaidMapper.java @@ -1,13 +1,13 @@ -package dao; - -import java.util.List; - -import Pojo.QueryVo; -import Pojo.Topaid; - -public interface TopaidMapper { -public void inserttopaid(Topaid topaid); -public List findtopaid(QueryVo vo); -public Topaid findbyid(Integer id); -public void deletetopaid(Integer id); -} +package store.zabbix.dao; + +import java.util.List; + +import store.zabbix.pojo.QueryVo; +import store.zabbix.pojo.Topaid; + +public interface TopaidMapper { +public void inserttopaid(Topaid topaid); +public List findtopaid(QueryVo vo); +public Topaid findbyid(Integer id); +public void deletetopaid(Integer id); +} diff --git a/src/dao/UserMapper.java b/src/main/java/store/zabbix/dao/UserMapper.java similarity index 88% rename from src/dao/UserMapper.java rename to src/main/java/store/zabbix/dao/UserMapper.java index c8e5a94..3a0575b 100644 --- a/src/dao/UserMapper.java +++ b/src/main/java/store/zabbix/dao/UserMapper.java @@ -1,32 +1,32 @@ -package dao; - -import Pojo.User; -import Pojo.UserExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface UserMapper { - int countByExample(UserExample example); - - int deleteByExample(UserExample example); - - int deleteByPrimaryKey(Integer id); - - int insert(User record); - - int insertSelective(User record); - - List selectByExample(UserExample example); - - User selectByPrimaryKey(Integer id); - - User selectByUser(User user); - - int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example); - - int updateByExample(@Param("record") User record, @Param("example") UserExample example); - - int updateByPrimaryKeySelective(User record); - - int updateByPrimaryKey(User record); +package store.zabbix.dao; + +import store.zabbix.pojo.User; +import store.zabbix.pojo.UserExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface UserMapper { + int countByExample(UserExample example); + + int deleteByExample(UserExample example); + + int deleteByPrimaryKey(Integer id); + + int insert(User record); + + int insertSelective(User record); + + List selectByExample(UserExample example); + + User selectByPrimaryKey(Integer id); + + User selectByUser(User user); + + int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example); + + int updateByExample(@Param("record") User record, @Param("example") UserExample example); + + int updateByPrimaryKeySelective(User record); + + int updateByPrimaryKey(User record); } \ No newline at end of file diff --git a/src/dao/UserlistMapper.java b/src/main/java/store/zabbix/dao/UserlistMapper.java similarity index 90% rename from src/dao/UserlistMapper.java rename to src/main/java/store/zabbix/dao/UserlistMapper.java index 6ec8b66..a0d440d 100644 --- a/src/dao/UserlistMapper.java +++ b/src/main/java/store/zabbix/dao/UserlistMapper.java @@ -1,20 +1,20 @@ -package dao; - -import java.util.List; - -import Pojo.Userlist; - -public interface UserlistMapper { - Userlist findhasuserlist(Integer user_id); - Userlist checkuserlist(String idcard); - void insertuserlist(Userlist userlist); - void updateuserlist(Userlist userlist); - Userlist finduserlistupdate(Userlist userlist); - public List getUserzuList(Integer id); - public List getmycheckout(Integer id); - public List getmyapply(Integer id); - public List getmyapplyout(Integer id); - public List findalluserlist(); - public void deleteuser(Integer id); - public void deleteuserlist(Integer id); -} +package store.zabbix.dao; + +import java.util.List; + +import store.zabbix.pojo.Userlist; + +public interface UserlistMapper { + Userlist findhasuserlist(Integer user_id); + Userlist checkuserlist(String idcard); + void insertuserlist(Userlist userlist); + void updateuserlist(Userlist userlist); + Userlist finduserlistupdate(Userlist userlist); + public List getUserzuList(Integer id); + public List getmycheckout(Integer id); + public List getmyapply(Integer id); + public List getmyapplyout(Integer id); + public List findalluserlist(); + public void deleteuser(Integer id); + public void deleteuserlist(Integer id); +} diff --git a/src/dao/WrongMapper.java b/src/main/java/store/zabbix/dao/WrongMapper.java similarity index 70% rename from src/dao/WrongMapper.java rename to src/main/java/store/zabbix/dao/WrongMapper.java index 6b7c89c..18c3b96 100644 --- a/src/dao/WrongMapper.java +++ b/src/main/java/store/zabbix/dao/WrongMapper.java @@ -1,13 +1,13 @@ -package dao; - -import java.util.List; - -import Pojo.QueryVo; -import Pojo.Wrong; - -public interface WrongMapper { - public List findwrong(QueryVo vo); - public Wrong findbyid(Integer id); - public void insertwrong(Wrong wrong); - public void deletewrong(Integer id); -} +package store.zabbix.dao; + +import java.util.List; + +import store.zabbix.pojo.QueryVo; +import store.zabbix.pojo.Wrong; + +public interface WrongMapper { + public List findwrong(QueryVo vo); + public Wrong findbyid(Integer id); + public void insertwrong(Wrong wrong); + public void deletewrong(Integer id); +} diff --git a/src/dao/ZulistMapper.java b/src/main/java/store/zabbix/dao/ZulistMapper.java similarity index 83% rename from src/dao/ZulistMapper.java rename to src/main/java/store/zabbix/dao/ZulistMapper.java index 90d22c3..d828535 100644 --- a/src/dao/ZulistMapper.java +++ b/src/main/java/store/zabbix/dao/ZulistMapper.java @@ -1,15 +1,14 @@ -package dao; - -import java.util.List; - -import Pojo.Apply; -import Pojo.Zulist; - -public interface ZulistMapper { - public void insertzulist(Zulist zulist); - public List findzuuserlist() throws Exception; - Zulist findzulist(String house_id); - public void deletezulist(String house_id); - public List findzulistbyuid(Integer userlist_id); - public Zulist findzukezulist(Integer id); -} +package store.zabbix.dao; + +import java.util.List; + +import store.zabbix.pojo.Zulist; + +public interface ZulistMapper { + public void insertzulist(Zulist zulist); + public List findzuuserlist() throws Exception; + Zulist findzulist(String house_id); + public void deletezulist(String house_id); + public List findzulistbyuid(Integer userlist_id); + public Zulist findzukezulist(Integer id); +} diff --git a/src/main/java/store/zabbix/pojo/Apply.java b/src/main/java/store/zabbix/pojo/Apply.java new file mode 100644 index 0000000..8ead8a4 --- /dev/null +++ b/src/main/java/store/zabbix/pojo/Apply.java @@ -0,0 +1,84 @@ +package store.zabbix.pojo; + +public class Apply { + private Integer id; + private String house_id; + private String address; + private double area; + private double price; + private Integer userlist_id; + private String status; + private Userlist userlist; + + public Userlist getUserlist() { + return userlist; + } + + public void setUserlist(Userlist userlist) { + this.userlist = userlist; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getHouse_id() { + return house_id; + } + + public void setHouse_id(String house_id) { + this.house_id = house_id; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public double getArea() { + return area; + } + + public void setArea(double area) { + this.area = area; + } + + public double getPrice() { + return price; + } + + public void setPrice(double price) { + this.price = price; + } + + public Integer getUserlist_id() { + return userlist_id; + } + + public void setUserlist_id(Integer userlist_id) { + this.userlist_id = userlist_id; + } + + @Override + public String toString() { + return "Apply [id=" + id + ", house_id=" + house_id + ", address=" + address + ", area=" + area + ", price=" + price + + ", userlist_id=" + userlist_id + ", status=" + status + ", userlist=" + userlist + "]"; + } + + +} diff --git a/src/Pojo/Applyout.java b/src/main/java/store/zabbix/pojo/Applyout.java similarity index 93% rename from src/Pojo/Applyout.java rename to src/main/java/store/zabbix/pojo/Applyout.java index d41796d..e35dfa1 100644 --- a/src/Pojo/Applyout.java +++ b/src/main/java/store/zabbix/pojo/Applyout.java @@ -1,50 +1,50 @@ -package Pojo; - -import java.util.List; - -public class Applyout { - private Integer id; - private String house_id; - private String address; - private String status; - private Integer userlist_id; - private List userlist; - -public List getUserlist() { - return userlist; -} -public void setUserlist(List userlist) { - this.userlist = userlist; -} -public Integer getId() { - return id; -} -public void setId(Integer id) { - this.id = id; -} -public String getHouse_id() { - return house_id; -} -public void setHouse_id(String house_id) { - this.house_id = house_id; -} -public String getAddress() { - return address; -} -public void setAddress(String address) { - this.address = address; -} -public String getStatus() { - return status; -} -public void setStatus(String status) { - this.status = status; -} -public Integer getUserlist_id() { - return userlist_id; -} -public void setUserlist_id(Integer userlist_id) { - this.userlist_id = userlist_id; -} - -} +package store.zabbix.pojo; + +import java.util.List; + +public class Applyout { + private Integer id; + private String house_id; + private String address; + private String status; + private Integer userlist_id; + private List userlist; + +public List getUserlist() { + return userlist; +} +public void setUserlist(List userlist) { + this.userlist = userlist; +} +public Integer getId() { + return id; +} +public void setId(Integer id) { + this.id = id; +} +public String getHouse_id() { + return house_id; +} +public void setHouse_id(String house_id) { + this.house_id = house_id; +} +public String getAddress() { + return address; +} +public void setAddress(String address) { + this.address = address; +} +public String getStatus() { + return status; +} +public void setStatus(String status) { + this.status = status; +} +public Integer getUserlist_id() { + return userlist_id; +} +public void setUserlist_id(Integer userlist_id) { + this.userlist_id = userlist_id; +} + +} diff --git a/src/Pojo/Checkout.java b/src/main/java/store/zabbix/pojo/Checkout.java similarity index 91% rename from src/Pojo/Checkout.java rename to src/main/java/store/zabbix/pojo/Checkout.java index 18317c5..cf47301 100644 --- a/src/Pojo/Checkout.java +++ b/src/main/java/store/zabbix/pojo/Checkout.java @@ -1,51 +1,49 @@ -package Pojo; - -import java.util.List; - -public class Checkout { - - private Integer id; - private String house_id; - private String address; - private String status; - private Integer userlist_id; - private Userlist userlist; - - public Userlist getUserlist() { - return userlist; - } - public void setUserlist(Userlist userlist) { - this.userlist = userlist; - } - public Integer getId() { - return id; - } - public void setId(Integer id) { - this.id = id; - } - public String getHouse_id() { - return house_id; - } - public void setHouse_id(String house_id) { - this.house_id = house_id; - } - public String getAddress() { - return address; - } - public void setAddress(String address) { - this.address = address; - } - public String getStatus() { - return status; - } - public void setStatus(String status) { - this.status = status; - } - public Integer getUserlist_id() { - return userlist_id; - } - public void setUserlist_id(Integer userlist_id) { - this.userlist_id = userlist_id; - } - -} +package store.zabbix.pojo; + +public class Checkout { + + private Integer id; + private String house_id; + private String address; + private String status; + private Integer userlist_id; + private Userlist userlist; + + public Userlist getUserlist() { + return userlist; + } + public void setUserlist(Userlist userlist) { + this.userlist = userlist; + } + public Integer getId() { + return id; + } + public void setId(Integer id) { + this.id = id; + } + public String getHouse_id() { + return house_id; + } + public void setHouse_id(String house_id) { + this.house_id = house_id; + } + public String getAddress() { + return address; + } + public void setAddress(String address) { + this.address = address; + } + public String getStatus() { + return status; + } + public void setStatus(String status) { + this.status = status; + } + public Integer getUserlist_id() { + return userlist_id; + } + public void setUserlist_id(Integer userlist_id) { + this.userlist_id = userlist_id; + } + +} diff --git a/src/Pojo/Hetong.java b/src/main/java/store/zabbix/pojo/Hetong.java similarity index 94% rename from src/Pojo/Hetong.java rename to src/main/java/store/zabbix/pojo/Hetong.java index 6af29d3..df82521 100644 --- a/src/Pojo/Hetong.java +++ b/src/main/java/store/zabbix/pojo/Hetong.java @@ -1,82 +1,82 @@ -package Pojo; - -public class Hetong { -private Integer id; -private String chuzu; -private String chuzu_idcard; -private String zuke; -private String zuke_idcard; -private String fromdate; -private String todate; -private double price; -private String address; -private String house_id; -private Integer payday; -public Integer getId() { - return id; -} -public void setId(Integer id) { - this.id = id; -} -public String getChuzu() { - return chuzu; -} -public void setChuzu(String chuzu) { - this.chuzu = chuzu; -} -public String getChuzu_idcard() { - return chuzu_idcard; -} -public void setChuzu_idcard(String chuzu_idcard) { - this.chuzu_idcard = chuzu_idcard; -} -public String getZuke() { - return zuke; -} -public void setZuke(String zuke) { - this.zuke = zuke; -} -public String getZuke_idcard() { - return zuke_idcard; -} -public void setZuke_idcard(String zuke_idcard) { - this.zuke_idcard = zuke_idcard; -} -public String getFromdate() { - return fromdate; -} -public void setFromdate(String fromdate) { - this.fromdate = fromdate; -} -public String getTodate() { - return todate; -} -public void setTodate(String todate) { - this.todate = todate; -} -public double getPrice() { - return price; -} -public void setPrice(double price) { - this.price = price; -} -public String getAddress() { - return address; -} -public void setAddress(String address) { - this.address = address; -} -public String getHouse_id() { - return house_id; -} -public void setHouse_id(String house_id) { - this.house_id = house_id; -} -public Integer getPayday() { - return payday; -} -public void setPayday(Integer payday) { - this.payday = payday; -} - -} +package store.zabbix.pojo; + +public class Hetong { +private Integer id; +private String chuzu; +private String chuzu_idcard; +private String zuke; +private String zuke_idcard; +private String fromdate; +private String todate; +private double price; +private String address; +private String house_id; +private Integer payday; +public Integer getId() { + return id; +} +public void setId(Integer id) { + this.id = id; +} +public String getChuzu() { + return chuzu; +} +public void setChuzu(String chuzu) { + this.chuzu = chuzu; +} +public String getChuzu_idcard() { + return chuzu_idcard; +} +public void setChuzu_idcard(String chuzu_idcard) { + this.chuzu_idcard = chuzu_idcard; +} +public String getZuke() { + return zuke; +} +public void setZuke(String zuke) { + this.zuke = zuke; +} +public String getZuke_idcard() { + return zuke_idcard; +} +public void setZuke_idcard(String zuke_idcard) { + this.zuke_idcard = zuke_idcard; +} +public String getFromdate() { + return fromdate; +} +public void setFromdate(String fromdate) { + this.fromdate = fromdate; +} +public String getTodate() { + return todate; +} +public void setTodate(String todate) { + this.todate = todate; +} +public double getPrice() { + return price; +} +public void setPrice(double price) { + this.price = price; +} +public String getAddress() { + return address; +} +public void setAddress(String address) { + this.address = address; +} +public String getHouse_id() { + return house_id; +} +public void setHouse_id(String house_id) { + this.house_id = house_id; +} +public Integer getPayday() { + return payday; +} +public void setPayday(Integer payday) { + this.payday = payday; +} + +} diff --git a/src/Pojo/Houselist.java b/src/main/java/store/zabbix/pojo/Houselist.java similarity index 92% rename from src/Pojo/Houselist.java rename to src/main/java/store/zabbix/pojo/Houselist.java index 79b1f32..12f7439 100644 --- a/src/Pojo/Houselist.java +++ b/src/main/java/store/zabbix/pojo/Houselist.java @@ -1,47 +1,47 @@ -package Pojo; - -public class Houselist { - private Integer id; - private String houseid; - private String address; - private double area; - private double price; - private String status; -public Integer getId() { - return id; -} -public void setId(Integer id) { - this.id = id; -} -public String getHouseid() { - return houseid; -} -public void setHouseid(String houseid) { - this.houseid = houseid; -} -public String getAddress() { - return address; -} -public void setAddress(String address) { - this.address = address; -} -public double getArea() { - return area; -} -public void setArea(double area) { - this.area = area; -} -public double getPrice() { - return price; -} -public void setPrice(double price) { - this.price = price; -} -public String getStatus() { - return status; -} -public void setStatus(String status) { - this.status = status; -} - -} +package store.zabbix.pojo; + +public class Houselist { + private Integer id; + private String houseid; + private String address; + private double area; + private double price; + private String status; +public Integer getId() { + return id; +} +public void setId(Integer id) { + this.id = id; +} +public String getHouseid() { + return houseid; +} +public void setHouseid(String houseid) { + this.houseid = houseid; +} +public String getAddress() { + return address; +} +public void setAddress(String address) { + this.address = address; +} +public double getArea() { + return area; +} +public void setArea(double area) { + this.area = area; +} +public double getPrice() { + return price; +} +public void setPrice(double price) { + this.price = price; +} +public String getStatus() { + return status; +} +public void setStatus(String status) { + this.status = status; +} + +} diff --git a/src/Pojo/Paid.java b/src/main/java/store/zabbix/pojo/Paid.java similarity index 93% rename from src/Pojo/Paid.java rename to src/main/java/store/zabbix/pojo/Paid.java index cf9a8ac..bbf9ab4 100644 --- a/src/Pojo/Paid.java +++ b/src/main/java/store/zabbix/pojo/Paid.java @@ -1,71 +1,71 @@ -package Pojo; - -import java.sql.Date; - -public class Paid { -private Integer id; -private String house_id; -private String address; -private Date date; -private Double price; -private String paydate; -private String name; -private Integer userlist_id; -private String status; - -public Double getPrice() { - return price; -} -public void setPrice(Double price) { - this.price = price; -} -public Integer getId() { - return id; -} -public void setId(Integer id) { - this.id = id; -} -public String getHouse_id() { - return house_id; -} -public void setHouse_id(String house_id) { - this.house_id = house_id; -} -public String getAddress() { - return address; -} -public void setAddress(String address) { - this.address = address; -} -public Date getDate() { - return date; -} -public void setDate(Date date) { - this.date = date; -} -public String getPaydate() { - return paydate; -} -public void setPaydate(String paydate) { - this.paydate = paydate; -} -public String getName() { - return name; -} -public void setName(String name) { - this.name = name; -} -public Integer getUserlist_id() { - return userlist_id; -} -public void setUserlist_id(Integer userlist_id) { - this.userlist_id = userlist_id; -} -public String getStatus() { - return status; -} -public void setStatus(String status) { - this.status = status; -} - -} +package store.zabbix.pojo; + +import java.sql.Date; + +public class Paid { +private Integer id; +private String house_id; +private String address; +private Date date; +private Double price; +private String paydate; +private String name; +private Integer userlist_id; +private String status; + +public Double getPrice() { + return price; +} +public void setPrice(Double price) { + this.price = price; +} +public Integer getId() { + return id; +} +public void setId(Integer id) { + this.id = id; +} +public String getHouse_id() { + return house_id; +} +public void setHouse_id(String house_id) { + this.house_id = house_id; +} +public String getAddress() { + return address; +} +public void setAddress(String address) { + this.address = address; +} +public Date getDate() { + return date; +} +public void setDate(Date date) { + this.date = date; +} +public String getPaydate() { + return paydate; +} +public void setPaydate(String paydate) { + this.paydate = paydate; +} +public String getName() { + return name; +} +public void setName(String name) { + this.name = name; +} +public Integer getUserlist_id() { + return userlist_id; +} +public void setUserlist_id(Integer userlist_id) { + this.userlist_id = userlist_id; +} +public String getStatus() { + return status; +} +public void setStatus(String status) { + this.status = status; +} + +} diff --git a/src/Pojo/QueryVo.java b/src/main/java/store/zabbix/pojo/QueryVo.java similarity index 89% rename from src/Pojo/QueryVo.java rename to src/main/java/store/zabbix/pojo/QueryVo.java index 0320740..c189223 100644 --- a/src/Pojo/QueryVo.java +++ b/src/main/java/store/zabbix/pojo/QueryVo.java @@ -1,37 +1,35 @@ -package Pojo; - -import java.sql.Date; - -public class QueryVo { -private String zuname; -private String fromdate; -private String todate; -private Integer userlist_id; - -public Integer getUserlist_id() { - return userlist_id; -} -public void setUserlist_id(Integer userlist_id) { - this.userlist_id = userlist_id; -} -public String getZuname() { - return zuname; -} -public void setZuname(String zuname) { - this.zuname = zuname; -} -public String getFromdate() { - return fromdate; -} -public void setFromdate(String fromdate) { - this.fromdate = fromdate; -} -public String getTodate() { - return todate; -} -public void setTodate(String todate) { - this.todate = todate; -} - - -} +package store.zabbix.pojo; + +public class QueryVo { +private String zuname; +private String fromdate; +private String todate; +private Integer userlist_id; + +public Integer getUserlist_id() { + return userlist_id; +} +public void setUserlist_id(Integer userlist_id) { + this.userlist_id = userlist_id; +} +public String getZuname() { + return zuname; +} +public void setZuname(String zuname) { + this.zuname = zuname; +} +public String getFromdate() { + return fromdate; +} +public void setFromdate(String fromdate) { + this.fromdate = fromdate; +} +public String getTodate() { + return todate; +} +public void setTodate(String todate) { + this.todate = todate; +} + + +} diff --git a/src/Pojo/Schedule.java b/src/main/java/store/zabbix/pojo/Schedule.java similarity index 91% rename from src/Pojo/Schedule.java rename to src/main/java/store/zabbix/pojo/Schedule.java index 735548c..928bf4e 100644 --- a/src/Pojo/Schedule.java +++ b/src/main/java/store/zabbix/pojo/Schedule.java @@ -1,26 +1,26 @@ -package Pojo; - -public class Schedule { - private Integer id; - private String date; - private String content; - public Integer getId() { - return id; - } - public void setId(Integer id) { - this.id = id; - } - public String getDate() { - return date; - } - public void setDate(String date) { - this.date = date; - } - public String getContent() { - return content; - } - public void setContent(String content) { - this.content = content; - } - -} +package store.zabbix.pojo; + +public class Schedule { + private Integer id; + private String date; + private String content; + public Integer getId() { + return id; + } + public void setId(Integer id) { + this.id = id; + } + public String getDate() { + return date; + } + public void setDate(String date) { + this.date = date; + } + public String getContent() { + return content; + } + public void setContent(String content) { + this.content = content; + } + +} diff --git a/src/Pojo/Solve.java b/src/main/java/store/zabbix/pojo/Solve.java similarity index 93% rename from src/Pojo/Solve.java rename to src/main/java/store/zabbix/pojo/Solve.java index 0a46f7e..01d5c08 100644 --- a/src/Pojo/Solve.java +++ b/src/main/java/store/zabbix/pojo/Solve.java @@ -1,63 +1,63 @@ -package Pojo; - -import java.sql.Date; - -public class Solve { -private Integer id; -private String house_id; -private String address; -private Date date; -private String detail; -private String name; -private Integer userlist_id; -private String status; -public Integer getId() { - return id; -} -public void setId(Integer id) { - this.id = id; -} -public String getHouse_id() { - return house_id; -} -public void setHouse_id(String house_id) { - this.house_id = house_id; -} -public String getAddress() { - return address; -} -public void setAddress(String address) { - this.address = address; -} -public Date getDate() { - return date; -} -public void setDate(Date date) { - this.date = date; -} -public String getDetail() { - return detail; -} -public void setDetail(String detail) { - this.detail = detail; -} -public String getName() { - return name; -} -public void setName(String name) { - this.name = name; -} -public Integer getUserlist_id() { - return userlist_id; -} -public void setUserlist_id(Integer userlist_id) { - this.userlist_id = userlist_id; -} -public String getStatus() { - return status; -} -public void setStatus(String status) { - this.status = status; -} - -} +package store.zabbix.pojo; + +import java.sql.Date; + +public class Solve { +private Integer id; +private String house_id; +private String address; +private Date date; +private String detail; +private String name; +private Integer userlist_id; +private String status; +public Integer getId() { + return id; +} +public void setId(Integer id) { + this.id = id; +} +public String getHouse_id() { + return house_id; +} +public void setHouse_id(String house_id) { + this.house_id = house_id; +} +public String getAddress() { + return address; +} +public void setAddress(String address) { + this.address = address; +} +public Date getDate() { + return date; +} +public void setDate(Date date) { + this.date = date; +} +public String getDetail() { + return detail; +} +public void setDetail(String detail) { + this.detail = detail; +} +public String getName() { + return name; +} +public void setName(String name) { + this.name = name; +} +public Integer getUserlist_id() { + return userlist_id; +} +public void setUserlist_id(Integer userlist_id) { + this.userlist_id = userlist_id; +} +public String getStatus() { + return status; +} +public void setStatus(String status) { + this.status = status; +} + +} diff --git a/src/Pojo/Topaid.java b/src/main/java/store/zabbix/pojo/Topaid.java similarity index 93% rename from src/Pojo/Topaid.java rename to src/main/java/store/zabbix/pojo/Topaid.java index 7f20b2a..be04510 100644 --- a/src/Pojo/Topaid.java +++ b/src/main/java/store/zabbix/pojo/Topaid.java @@ -1,64 +1,64 @@ -package Pojo; - -import java.sql.Date; - -public class Topaid { - private Integer id; - private String house_id; - private String address; - private Date date; - private Double price; - - private String name; - private Integer userlist_id; - private String status; - public Integer getId() { - return id; - } - public void setId(Integer id) { - this.id = id; - } - public String getHouse_id() { - return house_id; - } - public void setHouse_id(String house_id) { - this.house_id = house_id; - } - public String getAddress() { - return address; - } - public void setAddress(String address) { - this.address = address; - } - public Date getDate() { - return date; - } - public void setDate(Date date) { - this.date = date; - } - public Double getPrice() { - return price; - } - public void setPrice(Double price) { - this.price = price; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public Integer getUserlist_id() { - return userlist_id; - } - public void setUserlist_id(Integer userlist_id) { - this.userlist_id = userlist_id; - } - public String getStatus() { - return status; - } - public void setStatus(String status) { - this.status = status; - } - -} +package store.zabbix.pojo; + +import java.sql.Date; + +public class Topaid { + private Integer id; + private String house_id; + private String address; + private Date date; + private Double price; + + private String name; + private Integer userlist_id; + private String status; + public Integer getId() { + return id; + } + public void setId(Integer id) { + this.id = id; + } + public String getHouse_id() { + return house_id; + } + public void setHouse_id(String house_id) { + this.house_id = house_id; + } + public String getAddress() { + return address; + } + public void setAddress(String address) { + this.address = address; + } + public Date getDate() { + return date; + } + public void setDate(Date date) { + this.date = date; + } + public Double getPrice() { + return price; + } + public void setPrice(Double price) { + this.price = price; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public Integer getUserlist_id() { + return userlist_id; + } + public void setUserlist_id(Integer userlist_id) { + this.userlist_id = userlist_id; + } + public String getStatus() { + return status; + } + public void setStatus(String status) { + this.status = status; + } + +} diff --git a/src/Pojo/User.java b/src/main/java/store/zabbix/pojo/User.java similarity index 93% rename from src/Pojo/User.java rename to src/main/java/store/zabbix/pojo/User.java index 47532d5..5ac6322 100644 --- a/src/Pojo/User.java +++ b/src/main/java/store/zabbix/pojo/User.java @@ -1,50 +1,50 @@ -package Pojo; - -public class User { - private Integer id; - - private String username; - - private String password; - - private String type; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username == null ? null : username.trim(); - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password == null ? null : password.trim(); - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type == null ? null : type.trim(); - } - - @Override - public String toString() { - return "User [id=" + id + ", username=" + username + ", password=" + password + ", type=" + type + "]"; - } - - +package store.zabbix.pojo; + +public class User { + private Integer id; + + private String username; + + private String password; + + private String type; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username == null ? null : username.trim(); + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password == null ? null : password.trim(); + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type == null ? null : type.trim(); + } + + @Override + public String toString() { + return "User [id=" + id + ", username=" + username + ", password=" + password + ", type=" + type + "]"; + } + + } \ No newline at end of file diff --git a/src/Pojo/UserExample.java b/src/main/java/store/zabbix/pojo/UserExample.java similarity index 96% rename from src/Pojo/UserExample.java rename to src/main/java/store/zabbix/pojo/UserExample.java index c898160..3be8136 100644 --- a/src/Pojo/UserExample.java +++ b/src/main/java/store/zabbix/pojo/UserExample.java @@ -1,470 +1,470 @@ -package Pojo; - -import java.util.ArrayList; -import java.util.List; - -public class UserExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public UserExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Integer value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Integer value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Integer value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Integer value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Integer value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Integer value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Integer value1, Integer value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Integer value1, Integer value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andUsernameIsNull() { - addCriterion("username is null"); - return (Criteria) this; - } - - public Criteria andUsernameIsNotNull() { - addCriterion("username is not null"); - return (Criteria) this; - } - - public Criteria andUsernameEqualTo(String value) { - addCriterion("username =", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameNotEqualTo(String value) { - addCriterion("username <>", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameGreaterThan(String value) { - addCriterion("username >", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameGreaterThanOrEqualTo(String value) { - addCriterion("username >=", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameLessThan(String value) { - addCriterion("username <", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameLessThanOrEqualTo(String value) { - addCriterion("username <=", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameLike(String value) { - addCriterion("username like", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameNotLike(String value) { - addCriterion("username not like", value, "username"); - return (Criteria) this; - } - - public Criteria andUsernameIn(List values) { - addCriterion("username in", values, "username"); - return (Criteria) this; - } - - public Criteria andUsernameNotIn(List values) { - addCriterion("username not in", values, "username"); - return (Criteria) this; - } - - public Criteria andUsernameBetween(String value1, String value2) { - addCriterion("username between", value1, value2, "username"); - return (Criteria) this; - } - - public Criteria andUsernameNotBetween(String value1, String value2) { - addCriterion("username not between", value1, value2, "username"); - return (Criteria) this; - } - - public Criteria andPasswordIsNull() { - addCriterion("password is null"); - return (Criteria) this; - } - - public Criteria andPasswordIsNotNull() { - addCriterion("password is not null"); - return (Criteria) this; - } - - public Criteria andPasswordEqualTo(String value) { - addCriterion("password =", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordNotEqualTo(String value) { - addCriterion("password <>", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordGreaterThan(String value) { - addCriterion("password >", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordGreaterThanOrEqualTo(String value) { - addCriterion("password >=", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordLessThan(String value) { - addCriterion("password <", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordLessThanOrEqualTo(String value) { - addCriterion("password <=", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordLike(String value) { - addCriterion("password like", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordNotLike(String value) { - addCriterion("password not like", value, "password"); - return (Criteria) this; - } - - public Criteria andPasswordIn(List values) { - addCriterion("password in", values, "password"); - return (Criteria) this; - } - - public Criteria andPasswordNotIn(List values) { - addCriterion("password not in", values, "password"); - return (Criteria) this; - } - - public Criteria andPasswordBetween(String value1, String value2) { - addCriterion("password between", value1, value2, "password"); - return (Criteria) this; - } - - public Criteria andPasswordNotBetween(String value1, String value2) { - addCriterion("password not between", value1, value2, "password"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(String value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(String value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(String value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(String value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(String value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(String value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLike(String value) { - addCriterion("type like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotLike(String value) { - addCriterion("type not like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(String value1, String value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(String value1, String value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } +package store.zabbix.pojo; + +import java.util.ArrayList; +import java.util.List; + +public class UserExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public UserExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Integer value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Integer value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Integer value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Integer value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Integer value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Integer value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Integer value1, Integer value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Integer value1, Integer value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andUsernameIsNull() { + addCriterion("username is null"); + return (Criteria) this; + } + + public Criteria andUsernameIsNotNull() { + addCriterion("username is not null"); + return (Criteria) this; + } + + public Criteria andUsernameEqualTo(String value) { + addCriterion("username =", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotEqualTo(String value) { + addCriterion("username <>", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameGreaterThan(String value) { + addCriterion("username >", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameGreaterThanOrEqualTo(String value) { + addCriterion("username >=", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameLessThan(String value) { + addCriterion("username <", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameLessThanOrEqualTo(String value) { + addCriterion("username <=", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameLike(String value) { + addCriterion("username like", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotLike(String value) { + addCriterion("username not like", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameIn(List values) { + addCriterion("username in", values, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotIn(List values) { + addCriterion("username not in", values, "username"); + return (Criteria) this; + } + + public Criteria andUsernameBetween(String value1, String value2) { + addCriterion("username between", value1, value2, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotBetween(String value1, String value2) { + addCriterion("username not between", value1, value2, "username"); + return (Criteria) this; + } + + public Criteria andPasswordIsNull() { + addCriterion("password is null"); + return (Criteria) this; + } + + public Criteria andPasswordIsNotNull() { + addCriterion("password is not null"); + return (Criteria) this; + } + + public Criteria andPasswordEqualTo(String value) { + addCriterion("password =", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotEqualTo(String value) { + addCriterion("password <>", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordGreaterThan(String value) { + addCriterion("password >", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordGreaterThanOrEqualTo(String value) { + addCriterion("password >=", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordLessThan(String value) { + addCriterion("password <", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordLessThanOrEqualTo(String value) { + addCriterion("password <=", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordLike(String value) { + addCriterion("password like", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotLike(String value) { + addCriterion("password not like", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordIn(List values) { + addCriterion("password in", values, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotIn(List values) { + addCriterion("password not in", values, "password"); + return (Criteria) this; + } + + public Criteria andPasswordBetween(String value1, String value2) { + addCriterion("password between", value1, value2, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotBetween(String value1, String value2) { + addCriterion("password not between", value1, value2, "password"); + return (Criteria) this; + } + + public Criteria andTypeIsNull() { + addCriterion("type is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("type is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(String value) { + addCriterion("type =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(String value) { + addCriterion("type <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(String value) { + addCriterion("type >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(String value) { + addCriterion("type >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(String value) { + addCriterion("type <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(String value) { + addCriterion("type <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLike(String value) { + addCriterion("type like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotLike(String value) { + addCriterion("type not like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("type in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("type not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(String value1, String value2) { + addCriterion("type between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(String value1, String value2) { + addCriterion("type not between", value1, value2, "type"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } } \ No newline at end of file diff --git a/src/Pojo/Userlist.java b/src/main/java/store/zabbix/pojo/Userlist.java similarity index 93% rename from src/Pojo/Userlist.java rename to src/main/java/store/zabbix/pojo/Userlist.java index 2c222ba..dfa748a 100644 --- a/src/Pojo/Userlist.java +++ b/src/main/java/store/zabbix/pojo/Userlist.java @@ -1,79 +1,79 @@ -package Pojo; - -import java.util.List; - -public class Userlist { -private Integer id; -private String name; -private String idcard; -private String phone; -private Integer user_id; -private List apply; -private List zulist; -private List checkout; -private List applyout; -private User user; - -public User getUser() { - return user; -} -public void setUser(User user) { - this.user = user; -} -public List getApplyout() { - return applyout; -} -public void setApplyout(List applyout) { - this.applyout = applyout; -} -public List getCheckout() { - return checkout; -} -public void setCheckout(List checkout) { - this.checkout = checkout; -} -public List getZulist() { - return zulist; -} -public void setZulist(List zulist) { - this.zulist = zulist; -} -public List getApply() { - return apply; -} -public void setApply(List apply) { - this.apply = apply; -} - -public Integer getId() { - return id; -} -public void setId(Integer id) { - this.id = id; -} -public String getName() { - return name; -} -public void setName(String name) { - this.name = name; -} -public String getIdcard() { - return idcard; -} -public void setIdcard(String idcard) { - this.idcard = idcard; -} -public String getPhone() { - return phone; -} -public void setPhone(String phone) { - this.phone = phone; -} -public Integer getUser_id() { - return user_id; -} -public void setUser_id(Integer user_id) { - this.user_id = user_id; -} - -} +package store.zabbix.pojo; + +import java.util.List; + +public class Userlist { +private Integer id; +private String name; +private String idcard; +private String phone; +private Integer user_id; +private List apply; +private List zulist; +private List checkout; +private List applyout; +private User user; + +public User getUser() { + return user; +} +public void setUser(User user) { + this.user = user; +} +public List getApplyout() { + return applyout; +} +public void setApplyout(List applyout) { + this.applyout = applyout; +} +public List getCheckout() { + return checkout; +} +public void setCheckout(List checkout) { + this.checkout = checkout; +} +public List getZulist() { + return zulist; +} +public void setZulist(List zulist) { + this.zulist = zulist; +} +public List getApply() { + return apply; +} +public void setApply(List apply) { + this.apply = apply; +} + +public Integer getId() { + return id; +} +public void setId(Integer id) { + this.id = id; +} +public String getName() { + return name; +} +public void setName(String name) { + this.name = name; +} +public String getIdcard() { + return idcard; +} +public void setIdcard(String idcard) { + this.idcard = idcard; +} +public String getPhone() { + return phone; +} +public void setPhone(String phone) { + this.phone = phone; +} +public Integer getUser_id() { + return user_id; +} +public void setUser_id(Integer user_id) { + this.user_id = user_id; +} + +} diff --git a/src/Pojo/Wrong.java b/src/main/java/store/zabbix/pojo/Wrong.java similarity index 93% rename from src/Pojo/Wrong.java rename to src/main/java/store/zabbix/pojo/Wrong.java index e1ce195..9ec22bd 100644 --- a/src/Pojo/Wrong.java +++ b/src/main/java/store/zabbix/pojo/Wrong.java @@ -1,63 +1,63 @@ -package Pojo; - -import java.sql.Date; - -public class Wrong { - private Integer id; - private String house_id; - private String address; - private Date date; - private String detail; - private String name; - private Integer userlist_id; - private String status; -public Integer getId() { - return id; -} -public void setId(Integer id) { - this.id = id; -} -public String getHouse_id() { - return house_id; -} -public void setHouse_id(String house_id) { - this.house_id = house_id; -} -public String getAddress() { - return address; -} -public void setAddress(String address) { - this.address = address; -} -public Date getDate() { - return date; -} -public void setDate(Date date) { - this.date = date; -} -public String getDetail() { - return detail; -} -public void setDetail(String detail) { - this.detail = detail; -} -public String getName() { - return name; -} -public void setName(String name) { - this.name = name; -} -public Integer getUserlist_id() { - return userlist_id; -} -public void setUserlist_id(Integer userlist_id) { - this.userlist_id = userlist_id; -} -public String getStatus() { - return status; -} -public void setStatus(String status) { - this.status = status; -} - -} +package store.zabbix.pojo; + +import java.sql.Date; + +public class Wrong { + private Integer id; + private String house_id; + private String address; + private Date date; + private String detail; + private String name; + private Integer userlist_id; + private String status; +public Integer getId() { + return id; +} +public void setId(Integer id) { + this.id = id; +} +public String getHouse_id() { + return house_id; +} +public void setHouse_id(String house_id) { + this.house_id = house_id; +} +public String getAddress() { + return address; +} +public void setAddress(String address) { + this.address = address; +} +public Date getDate() { + return date; +} +public void setDate(Date date) { + this.date = date; +} +public String getDetail() { + return detail; +} +public void setDetail(String detail) { + this.detail = detail; +} +public String getName() { + return name; +} +public void setName(String name) { + this.name = name; +} +public Integer getUserlist_id() { + return userlist_id; +} +public void setUserlist_id(Integer userlist_id) { + this.userlist_id = userlist_id; +} +public String getStatus() { + return status; +} +public void setStatus(String status) { + this.status = status; +} + +} diff --git a/src/Pojo/Zulist.java b/src/main/java/store/zabbix/pojo/Zulist.java similarity index 94% rename from src/Pojo/Zulist.java rename to src/main/java/store/zabbix/pojo/Zulist.java index 873c737..24ac6f7 100644 --- a/src/Pojo/Zulist.java +++ b/src/main/java/store/zabbix/pojo/Zulist.java @@ -1,54 +1,54 @@ -package Pojo; - -public class Zulist { - private Integer zid; - private String house_id; - private Double price; - private String address; - private Integer userlist_id; - private Integer contract_id; - private Userlist userlist; - public Userlist getUserlist() { - return userlist; - } - public void setUserlist(Userlist userlist) { - this.userlist = userlist; - } - public Integer getZid() { - return zid; - } - public void setZid(Integer zid) { - this.zid = zid; - } - public String getHouse_id() { - return house_id; - } - public void setHouse_id(String house_id) { - this.house_id = house_id; - } - public Double getPrice() { - return price; - } - public void setPrice(Double price) { - this.price = price; - } - public String getAddress() { - return address; - } - public void setAddress(String address) { - this.address = address; - } - public Integer getUserlist_id() { - return userlist_id; - } - public void setUserlist_id(Integer userlist_id) { - this.userlist_id = userlist_id; - } - public Integer getContract_id() { - return contract_id; - } - public void setContract_id(Integer contract_id) { - this.contract_id = contract_id; - } - -} +package store.zabbix.pojo; + +public class Zulist { + private Integer zid; + private String house_id; + private Double price; + private String address; + private Integer userlist_id; + private Integer contract_id; + private Userlist userlist; + public Userlist getUserlist() { + return userlist; + } + public void setUserlist(Userlist userlist) { + this.userlist = userlist; + } + public Integer getZid() { + return zid; + } + public void setZid(Integer zid) { + this.zid = zid; + } + public String getHouse_id() { + return house_id; + } + public void setHouse_id(String house_id) { + this.house_id = house_id; + } + public Double getPrice() { + return price; + } + public void setPrice(Double price) { + this.price = price; + } + public String getAddress() { + return address; + } + public void setAddress(String address) { + this.address = address; + } + public Integer getUserlist_id() { + return userlist_id; + } + public void setUserlist_id(Integer userlist_id) { + this.userlist_id = userlist_id; + } + public Integer getContract_id() { + return contract_id; + } + public void setContract_id(Integer contract_id) { + this.contract_id = contract_id; + } + +} diff --git a/src/service/ApplyService.java b/src/main/java/store/zabbix/service/ApplyService.java similarity index 74% rename from src/service/ApplyService.java rename to src/main/java/store/zabbix/service/ApplyService.java index 194ad24..2d8c796 100644 --- a/src/service/ApplyService.java +++ b/src/main/java/store/zabbix/service/ApplyService.java @@ -1,15 +1,15 @@ -package service; - -import java.util.List; - -import Pojo.Apply; -import Pojo.Houselist; - -public interface ApplyService { - - public void insertapply(Apply apply); - public List findapplylist() throws Exception; - Apply findbyhouse_id(String house_id); - public void deletebyhouse_id(String house_id); - public void refuseapply(Houselist houselist); -} +package store.zabbix.service; + +import java.util.List; + +import store.zabbix.pojo.Apply; +import store.zabbix.pojo.Houselist; + +public interface ApplyService { + + public void insertapply(Apply apply); + public List findapplylist() throws Exception; + Apply findbyhouse_id(String house_id); + public void deletebyhouse_id(String house_id); + public void refuseapply(Houselist houselist); +} diff --git a/src/service/ApplyServiceImpl.java b/src/main/java/store/zabbix/service/ApplyServiceImpl.java similarity index 83% rename from src/service/ApplyServiceImpl.java rename to src/main/java/store/zabbix/service/ApplyServiceImpl.java index 813acfa..2cbe7e9 100644 --- a/src/service/ApplyServiceImpl.java +++ b/src/main/java/store/zabbix/service/ApplyServiceImpl.java @@ -1,58 +1,57 @@ -package service; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import Pojo.Apply; -import Pojo.Houselist; -import dao.ApplyMapper; -import dao.HouselistMapper; -import dao.UserlistMapper; - -@Service -@Transactional -public class ApplyServiceImpl implements ApplyService { - - @Autowired - private ApplyMapper applyMapper; - @Autowired - private HouselistMapper houselistMapper; - - @Override - public void insertapply(Apply apply) { - applyMapper.insertapply(apply); - - } - - @Override - public List findapplylist() throws Exception { - List apply=applyMapper.findapplylist(); - return apply; - } - - @Override - public Apply findbyhouse_id(String house_id) { - Apply apply=applyMapper.findbyhouse_id(house_id); - return apply; - } - - @Override - public void deletebyhouse_id(String house_id) { - applyMapper.deletebyhouse_id(house_id); - - } - - @Override - public void refuseapply(Houselist houselist) { - houselistMapper.updatestatus(houselist); - applyMapper.deletebyhouse_id(houselist.getHouseid()); - } - - - - - -} +package store.zabbix.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import store.zabbix.pojo.Apply; +import store.zabbix.pojo.Houselist; +import store.zabbix.dao.ApplyMapper; +import store.zabbix.dao.HouselistMapper; + +@Service +@Transactional +public class ApplyServiceImpl implements ApplyService { + + @Autowired + private ApplyMapper applyMapper; + @Autowired + private HouselistMapper houselistMapper; + + @Override + public void insertapply(Apply apply) { + applyMapper.insertapply(apply); + + } + + @Override + public List findapplylist() throws Exception { + List apply=applyMapper.findapplylist(); + return apply; + } + + @Override + public Apply findbyhouse_id(String house_id) { + Apply apply=applyMapper.findbyhouse_id(house_id); + return apply; + } + + @Override + public void deletebyhouse_id(String house_id) { + applyMapper.deletebyhouse_id(house_id); + + } + + @Override + public void refuseapply(Houselist houselist) { + houselistMapper.updatestatus(houselist); + applyMapper.deletebyhouse_id(houselist.getHouseid()); + } + + + + + +} diff --git a/src/service/ApplyoutService.java b/src/main/java/store/zabbix/service/ApplyoutService.java similarity index 73% rename from src/service/ApplyoutService.java rename to src/main/java/store/zabbix/service/ApplyoutService.java index 82fc712..b1231be 100644 --- a/src/service/ApplyoutService.java +++ b/src/main/java/store/zabbix/service/ApplyoutService.java @@ -1,14 +1,14 @@ -package service; - -import java.util.List; - -import Pojo.Applyout; -import Pojo.Zulist; - -public interface ApplyoutService { - public void insertapplyout(Zulist zulist); - List findallapplyout(); - public void updateapplyout(Applyout applyout); - public void agreeapplyout(Integer id); - public void deleteapplyout(Integer id); -} +package store.zabbix.service; + +import java.util.List; + +import store.zabbix.pojo.Applyout; +import store.zabbix.pojo.Zulist; + +public interface ApplyoutService { + public void insertapplyout(Zulist zulist); + List findallapplyout(); + public void updateapplyout(Applyout applyout); + public void agreeapplyout(Integer id); + public void deleteapplyout(Integer id); +} diff --git a/src/service/ApplyoutServiceImpl.java b/src/main/java/store/zabbix/service/ApplyoutServiceImpl.java similarity index 84% rename from src/service/ApplyoutServiceImpl.java rename to src/main/java/store/zabbix/service/ApplyoutServiceImpl.java index c4afe2e..59ec86a 100644 --- a/src/service/ApplyoutServiceImpl.java +++ b/src/main/java/store/zabbix/service/ApplyoutServiceImpl.java @@ -1,75 +1,74 @@ -package service; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import Pojo.Applyout; -import Pojo.Checkout; -import Pojo.Houselist; -import Pojo.Zulist; -import dao.ApplyoutMapper; -import dao.CheckoutMapper; -import dao.HetongMapper; -import dao.HouselistMapper; -import dao.ZulistMapper; - -@Service -@Transactional -public class ApplyoutServiceImpl implements ApplyoutService { - - @Autowired - private ApplyoutMapper applyoutMapper; - @Autowired - private HouselistMapper houselistMapper; - @Autowired - private HetongMapper hetongMapper; - @Autowired - private CheckoutMapper checkoutMapper; - @Autowired - private ZulistMapper zulistMapper; - @Override - public void insertapplyout(Zulist zulist) { - Applyout applyout=new Applyout(); - applyout.setHouse_id(zulist.getHouse_id()); - applyout.setAddress(zulist.getAddress()); - applyout.setStatus("申请中"); - applyout.setUserlist_id(zulist.getUserlist_id()); - applyoutMapper.insertapplyout(applyout); - - } - @Override - public List findallapplyout() { - List list=applyoutMapper.findallapplyout(); - return list; - } - @Override - public void updateapplyout(Applyout applyout) { - - applyoutMapper.updateapplyout(applyout); - } - @Override - public void agreeapplyout(Integer id) { - Applyout applyout=applyoutMapper.findbyid(id); - houselistMapper.deletehousebyhouseid(applyout.getHouse_id()); - hetongMapper.deletehetong(applyout.getHouse_id()); - Checkout checkout=new Checkout(); - checkout.setHouse_id(applyout.getHouse_id()); - checkout.setAddress(applyout.getAddress()); - checkout.setStatus("已退租"); - checkout.setUserlist_id(applyout.getUserlist_id()); - checkoutMapper.insertcheckout(checkout); - applyout.setStatus("已同意"); - applyoutMapper.updateapplyoutbyhouse(applyout); - zulistMapper.deletezulist(applyout.getHouse_id()); - } - @Override - public void deleteapplyout(Integer id) { - - applyoutMapper.deleteapplyout(id); - } - - -} +package store.zabbix.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import store.zabbix.pojo.Applyout; +import store.zabbix.pojo.Checkout; +import store.zabbix.pojo.Zulist; +import store.zabbix.dao.ApplyoutMapper; +import store.zabbix.dao.CheckoutMapper; +import store.zabbix.dao.HetongMapper; +import store.zabbix.dao.HouselistMapper; +import store.zabbix.dao.ZulistMapper; + +@Service +@Transactional +public class ApplyoutServiceImpl implements ApplyoutService { + + @Autowired + private ApplyoutMapper applyoutMapper; + @Autowired + private HouselistMapper houselistMapper; + @Autowired + private HetongMapper hetongMapper; + @Autowired + private CheckoutMapper checkoutMapper; + @Autowired + private ZulistMapper zulistMapper; + @Override + public void insertapplyout(Zulist zulist) { + Applyout applyout=new Applyout(); + applyout.setHouse_id(zulist.getHouse_id()); + applyout.setAddress(zulist.getAddress()); + applyout.setStatus("申请中"); + applyout.setUserlist_id(zulist.getUserlist_id()); + applyoutMapper.insertapplyout(applyout); + + } + @Override + public List findallapplyout() { + List list=applyoutMapper.findallapplyout(); + return list; + } + @Override + public void updateapplyout(Applyout applyout) { + + applyoutMapper.updateapplyout(applyout); + } + @Override + public void agreeapplyout(Integer id) { + Applyout applyout=applyoutMapper.findbyid(id); + houselistMapper.deletehousebyhouseid(applyout.getHouse_id()); + hetongMapper.deletehetong(applyout.getHouse_id()); + Checkout checkout=new Checkout(); + checkout.setHouse_id(applyout.getHouse_id()); + checkout.setAddress(applyout.getAddress()); + checkout.setStatus("已退租"); + checkout.setUserlist_id(applyout.getUserlist_id()); + checkoutMapper.insertcheckout(checkout); + applyout.setStatus("已同意"); + applyoutMapper.updateapplyoutbyhouse(applyout); + zulistMapper.deletezulist(applyout.getHouse_id()); + } + @Override + public void deleteapplyout(Integer id) { + + applyoutMapper.deleteapplyout(id); + } + + +} diff --git a/src/main/java/store/zabbix/service/CheckoutService.java b/src/main/java/store/zabbix/service/CheckoutService.java new file mode 100644 index 0000000..c9a769f --- /dev/null +++ b/src/main/java/store/zabbix/service/CheckoutService.java @@ -0,0 +1,13 @@ +package store.zabbix.service; + +import java.util.List; + +import store.zabbix.pojo.Checkout; + +public interface CheckoutService { + void insertcheckout(Checkout checkout); + + List getallcheckout(); + + void deletecheckout(Integer id); +} diff --git a/src/service/CheckoutServiceImpl.java b/src/main/java/store/zabbix/service/CheckoutServiceImpl.java similarity index 78% rename from src/service/CheckoutServiceImpl.java rename to src/main/java/store/zabbix/service/CheckoutServiceImpl.java index 5a0056a..7c5c731 100644 --- a/src/service/CheckoutServiceImpl.java +++ b/src/main/java/store/zabbix/service/CheckoutServiceImpl.java @@ -1,40 +1,37 @@ -package service; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.ui.Model; - -import Pojo.Applyout; -import Pojo.Checkout; -import Pojo.Zulist; -import dao.CheckoutMapper; -@Service -@Transactional -public class CheckoutServiceImpl implements CheckoutService { - - @Autowired - private CheckoutMapper checkoutMapper; - - @Override - public void insertcheckout(Checkout checkout) { - checkoutMapper.insertcheckout(checkout); - - } - - @Override - public List getallcheckout() { - List checkout=checkoutMapper.getallcheckout(); - return checkout; - } - - @Override - public void deletecheckout(Integer id) { - - checkoutMapper.deletecheckout(id); - } - - -} +package store.zabbix.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import store.zabbix.pojo.Checkout; +import store.zabbix.dao.CheckoutMapper; +@Service +@Transactional +public class CheckoutServiceImpl implements CheckoutService { + + @Autowired + private CheckoutMapper checkoutMapper; + + @Override + public void insertcheckout(Checkout checkout) { + checkoutMapper.insertcheckout(checkout); + + } + + @Override + public List getallcheckout() { + List checkout=checkoutMapper.getallcheckout(); + return checkout; + } + + @Override + public void deletecheckout(Integer id) { + + checkoutMapper.deletecheckout(id); + } + + +} diff --git a/src/service/HetongService.java b/src/main/java/store/zabbix/service/HetongService.java similarity index 76% rename from src/service/HetongService.java rename to src/main/java/store/zabbix/service/HetongService.java index 63140e6..62fd314 100644 --- a/src/service/HetongService.java +++ b/src/main/java/store/zabbix/service/HetongService.java @@ -1,11 +1,11 @@ -package service; - -import Pojo.Hetong; - -public interface HetongService { - - public void inserthetong(Hetong hetong); - public Hetong findhetong(String house_id); - public void updatehetong(Hetong hetong); - public void deletehetong(String house_id); -} +package store.zabbix.service; + +import store.zabbix.pojo.Hetong; + +public interface HetongService { + + public void inserthetong(Hetong hetong); + public Hetong findhetong(String house_id); + public void updatehetong(Hetong hetong); + public void deletehetong(String house_id); +} diff --git a/src/service/HetongServiceImpl.java b/src/main/java/store/zabbix/service/HetongServiceImpl.java similarity index 88% rename from src/service/HetongServiceImpl.java rename to src/main/java/store/zabbix/service/HetongServiceImpl.java index 0d07317..ae4ce17 100644 --- a/src/service/HetongServiceImpl.java +++ b/src/main/java/store/zabbix/service/HetongServiceImpl.java @@ -1,41 +1,41 @@ -package service; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import Pojo.Hetong; -import dao.HetongMapper; - -@Service -@Transactional -public class HetongServiceImpl implements HetongService { - @Autowired - private HetongMapper hetongMapper; - - @Override - public void inserthetong(Hetong hetong) { - hetongMapper.inserthetong(hetong); - - } - - @Override - public Hetong findhetong(String house_id) { - Hetong hetong=hetongMapper.findhetong(house_id); - return hetong; - } - - @Override - public void updatehetong(Hetong hetong) { - - hetongMapper.updatehetong(hetong); - } - - @Override - public void deletehetong(String house_id) { - // TODO Auto-generated method stub - hetongMapper.deletehetong(house_id); - - } - -} +package store.zabbix.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import store.zabbix.pojo.Hetong; +import store.zabbix.dao.HetongMapper; + +@Service +@Transactional +public class HetongServiceImpl implements HetongService { + @Autowired + private HetongMapper hetongMapper; + + @Override + public void inserthetong(Hetong hetong) { + hetongMapper.inserthetong(hetong); + + } + + @Override + public Hetong findhetong(String house_id) { + Hetong hetong=hetongMapper.findhetong(house_id); + return hetong; + } + + @Override + public void updatehetong(Hetong hetong) { + + hetongMapper.updatehetong(hetong); + } + + @Override + public void deletehetong(String house_id) { + // TODO Auto-generated method stub + hetongMapper.deletehetong(house_id); + + } + +} diff --git a/src/service/HouselistService.java b/src/main/java/store/zabbix/service/HouselistService.java similarity index 84% rename from src/service/HouselistService.java rename to src/main/java/store/zabbix/service/HouselistService.java index b491c37..e92cabd 100644 --- a/src/service/HouselistService.java +++ b/src/main/java/store/zabbix/service/HouselistService.java @@ -1,18 +1,17 @@ -package service; - -import java.util.List; - -import Pojo.Houselist; -import Pojo.QueryVo; - -public interface HouselistService { - List selectAll(); - Houselist findhouseid(String houseid); - void inserthouse(Houselist houselist); - void deletehouse(int id); - Houselist findid(int id); - Houselist findhouseidupdate(Houselist houselist); - void updatehouse(Houselist houselist); - void updatehousestatus(Houselist houselist); - public void deletehousebyhouseid(String house_id); -} +package store.zabbix.service; + +import java.util.List; + +import store.zabbix.pojo.Houselist; + +public interface HouselistService { + List selectAll(); + Houselist findhouseid(String houseid); + void inserthouse(Houselist houselist); + void deletehouse(int id); + Houselist findid(int id); + Houselist findhouseidupdate(Houselist houselist); + void updatehouse(Houselist houselist); + void updatehousestatus(Houselist houselist); + public void deletehousebyhouseid(String house_id); +} diff --git a/src/service/HouselistServiceImpl.java b/src/main/java/store/zabbix/service/HouselistServiceImpl.java similarity index 89% rename from src/service/HouselistServiceImpl.java rename to src/main/java/store/zabbix/service/HouselistServiceImpl.java index 372fa5e..4255803 100644 --- a/src/service/HouselistServiceImpl.java +++ b/src/main/java/store/zabbix/service/HouselistServiceImpl.java @@ -1,73 +1,72 @@ -package service; - -import java.util.List; - -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import Pojo.Houselist; -import Pojo.QueryVo; -import dao.HouselistMapper; - -@Service -public class HouselistServiceImpl implements HouselistService { - - @Autowired - private HouselistMapper houselistMapper; - - @Override - public List selectAll() { - List houselist=houselistMapper.selectAll(); - return houselist; - } - - @Override - public Houselist findhouseid(String houseid) { - Houselist houselist=houselistMapper.findhouseid(houseid); - return houselist; - } - - @Override - public void inserthouse(Houselist houselist) { - // TODO Auto-generated method stub - houselistMapper.inserthouse(houselist); - } - - @Override - public void deletehouse(int id) { - // TODO Auto-generated method stub - houselistMapper.deletehouse(id); - } - - @Override - public Houselist findhouseidupdate(Houselist houselist) { - Houselist list=houselistMapper.findhouseidupdate(houselist); - return list; - } - - @Override - public void updatehouse(Houselist houselist) { - houselistMapper.updatehouse(houselist); - - } - - @Override - public Houselist findid(int id) { - Houselist list=houselistMapper.findid(id); - return list; - } - - @Override - public void updatehousestatus(Houselist houselist) { - // TODO Auto-generated method stub - houselistMapper.updatehousestatus(houselist); - } - - @Override - public void deletehousebyhouseid(String house_id) { - houselistMapper.deletehousebyhouseid(house_id); - - } - - - -} +package store.zabbix.service; + +import java.util.List; + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import store.zabbix.pojo.Houselist; +import store.zabbix.dao.HouselistMapper; + +@Service +public class HouselistServiceImpl implements HouselistService { + + @Autowired + private HouselistMapper houselistMapper; + + @Override + public List selectAll() { + List houselist=houselistMapper.selectAll(); + return houselist; + } + + @Override + public Houselist findhouseid(String houseid) { + Houselist houselist=houselistMapper.findhouseid(houseid); + return houselist; + } + + @Override + public void inserthouse(Houselist houselist) { + // TODO Auto-generated method stub + houselistMapper.inserthouse(houselist); + } + + @Override + public void deletehouse(int id) { + // TODO Auto-generated method stub + houselistMapper.deletehouse(id); + } + + @Override + public Houselist findhouseidupdate(Houselist houselist) { + Houselist list=houselistMapper.findhouseidupdate(houselist); + return list; + } + + @Override + public void updatehouse(Houselist houselist) { + houselistMapper.updatehouse(houselist); + + } + + @Override + public Houselist findid(int id) { + Houselist list=houselistMapper.findid(id); + return list; + } + + @Override + public void updatehousestatus(Houselist houselist) { + // TODO Auto-generated method stub + houselistMapper.updatehousestatus(houselist); + } + + @Override + public void deletehousebyhouseid(String house_id) { + houselistMapper.deletehousebyhouseid(house_id); + + } + + + +} diff --git a/src/service/PaidService.java b/src/main/java/store/zabbix/service/PaidService.java similarity index 68% rename from src/service/PaidService.java rename to src/main/java/store/zabbix/service/PaidService.java index 913ab17..08ff3c6 100644 --- a/src/service/PaidService.java +++ b/src/main/java/store/zabbix/service/PaidService.java @@ -1,16 +1,16 @@ -package service; - -import java.util.List; - -import Pojo.Paid; -import Pojo.QueryVo; -import Pojo.Zulist; - -public interface PaidService { - public List selectall(QueryVo vo); - public Double selectsum(QueryVo vo); - public void deletepaid(Integer id); - public List findzuuserlist() throws Exception; - public Zulist findzukezulist(Integer id); - -} +package store.zabbix.service; + +import java.util.List; + +import store.zabbix.pojo.Paid; +import store.zabbix.pojo.QueryVo; +import store.zabbix.pojo.Zulist; + +public interface PaidService { + public List selectall(QueryVo vo); + public Double selectsum(QueryVo vo); + public void deletepaid(Integer id); + public List findzuuserlist() throws Exception; + public Zulist findzukezulist(Integer id); + +} diff --git a/src/service/PaidServiceImpl.java b/src/main/java/store/zabbix/service/PaidServiceImpl.java similarity index 82% rename from src/service/PaidServiceImpl.java rename to src/main/java/store/zabbix/service/PaidServiceImpl.java index 8b2dd80..955ab62 100644 --- a/src/service/PaidServiceImpl.java +++ b/src/main/java/store/zabbix/service/PaidServiceImpl.java @@ -1,53 +1,53 @@ -package service; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import Pojo.Paid; -import Pojo.QueryVo; -import Pojo.Zulist; -import dao.PaidMapper; -import dao.ZulistMapper; -@Service -@Transactional -public class PaidServiceImpl implements PaidService { - @Autowired - private PaidMapper paidMapper; - @Autowired - private ZulistMapper zulistMapper; - - @Override - public List selectall(QueryVo vo) { - List list=paidMapper.selectall(vo); - return list; - } - - @Override - public Double selectsum(QueryVo vo) { - Double sum=paidMapper.selectsum(vo); - return sum; - } - - @Override - public void deletepaid(Integer id) { - paidMapper.deletepaid(id); - - } - - @Override - public List findzuuserlist() throws Exception{ - List list=zulistMapper.findzuuserlist(); - return list; - } - - @Override - public Zulist findzukezulist(Integer id) { - Zulist zulist=zulistMapper.findzukezulist(id); - return zulist; - } - - -} +package store.zabbix.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import store.zabbix.pojo.Paid; +import store.zabbix.pojo.QueryVo; +import store.zabbix.pojo.Zulist; +import store.zabbix.dao.PaidMapper; +import store.zabbix.dao.ZulistMapper; +@Service +@Transactional +public class PaidServiceImpl implements PaidService { + @Autowired + private PaidMapper paidMapper; + @Autowired + private ZulistMapper zulistMapper; + + @Override + public List selectall(QueryVo vo) { + List list=paidMapper.selectall(vo); + return list; + } + + @Override + public Double selectsum(QueryVo vo) { + Double sum=paidMapper.selectsum(vo); + return sum; + } + + @Override + public void deletepaid(Integer id) { + paidMapper.deletepaid(id); + + } + + @Override + public List findzuuserlist() throws Exception{ + List list=zulistMapper.findzuuserlist(); + return list; + } + + @Override + public Zulist findzukezulist(Integer id) { + Zulist zulist=zulistMapper.findzukezulist(id); + return zulist; + } + + +} diff --git a/src/service/ScheduleService.java b/src/main/java/store/zabbix/service/ScheduleService.java similarity index 80% rename from src/service/ScheduleService.java rename to src/main/java/store/zabbix/service/ScheduleService.java index e62775a..f0327ec 100644 --- a/src/service/ScheduleService.java +++ b/src/main/java/store/zabbix/service/ScheduleService.java @@ -1,13 +1,13 @@ -package service; - -import java.util.List; - -import Pojo.Schedule; - -public interface ScheduleService { - public void insertschedule(Schedule schedule); - public List selectAll(); - public void deleteschedule(Integer id); - public void updateschedule(Schedule schedule); - public Schedule selectbyid(Integer id); -} +package store.zabbix.service; + +import java.util.List; + +import store.zabbix.pojo.Schedule; + +public interface ScheduleService { + public void insertschedule(Schedule schedule); + public List selectAll(); + public void deleteschedule(Integer id); + public void updateschedule(Schedule schedule); + public Schedule selectbyid(Integer id); +} diff --git a/src/service/ScheduleServiceImpl.java b/src/main/java/store/zabbix/service/ScheduleServiceImpl.java similarity index 88% rename from src/service/ScheduleServiceImpl.java rename to src/main/java/store/zabbix/service/ScheduleServiceImpl.java index 2b4188a..da303a2 100644 --- a/src/service/ScheduleServiceImpl.java +++ b/src/main/java/store/zabbix/service/ScheduleServiceImpl.java @@ -1,46 +1,46 @@ -package service; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import Pojo.Schedule; -import dao.ScheduleMapper; -@Service -@Transactional -public class ScheduleServiceImpl implements ScheduleService { - @Autowired - private ScheduleMapper scheduleMapper; - @Override - public void insertschedule(Schedule schedule) { - scheduleMapper.insertschedule(schedule); - - } - - @Override - public List selectAll() { - List list=scheduleMapper.selectAll(); - return list; - } - - @Override - public void deleteschedule(Integer id) { - scheduleMapper.deleteschedule(id); - - } - - @Override - public void updateschedule(Schedule schedule) { - scheduleMapper.updateschedule(schedule); - - } - - @Override - public Schedule selectbyid(Integer id) { - Schedule schedule=scheduleMapper.selectbyid(id); - return schedule; - } - -} +package store.zabbix.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import store.zabbix.pojo.Schedule; +import store.zabbix.dao.ScheduleMapper; +@Service +@Transactional +public class ScheduleServiceImpl implements ScheduleService { + @Autowired + private ScheduleMapper scheduleMapper; + @Override + public void insertschedule(Schedule schedule) { + scheduleMapper.insertschedule(schedule); + + } + + @Override + public List selectAll() { + List list=scheduleMapper.selectAll(); + return list; + } + + @Override + public void deleteschedule(Integer id) { + scheduleMapper.deleteschedule(id); + + } + + @Override + public void updateschedule(Schedule schedule) { + scheduleMapper.updateschedule(schedule); + + } + + @Override + public Schedule selectbyid(Integer id) { + Schedule schedule=scheduleMapper.selectbyid(id); + return schedule; + } + +} diff --git a/src/service/SolveService.java b/src/main/java/store/zabbix/service/SolveService.java similarity index 73% rename from src/service/SolveService.java rename to src/main/java/store/zabbix/service/SolveService.java index 98e2864..7141e2c 100644 --- a/src/service/SolveService.java +++ b/src/main/java/store/zabbix/service/SolveService.java @@ -1,19 +1,18 @@ -package service; - -import java.util.List; - -import Pojo.Paid; -import Pojo.QueryVo; -import Pojo.Solve; -import Pojo.Wrong; - -public interface SolveService { - public List selectall(QueryVo vo); - public Integer selectcount(QueryVo vo); - public void deletesolve(Integer id); - - public List findwrong(QueryVo vo); - public Wrong findbyid(Integer id); - public void insertwrong(Wrong wrong); - public void gotosolve(Integer id, Solve solve); -} +package store.zabbix.service; + +import java.util.List; + +import store.zabbix.pojo.QueryVo; +import store.zabbix.pojo.Solve; +import store.zabbix.pojo.Wrong; + +public interface SolveService { + public List selectall(QueryVo vo); + public Integer selectcount(QueryVo vo); + public void deletesolve(Integer id); + + public List findwrong(QueryVo vo); + public Wrong findbyid(Integer id); + public void insertwrong(Wrong wrong); + public void gotosolve(Integer id, Solve solve); +} diff --git a/src/service/SolveServiceImpl.java b/src/main/java/store/zabbix/service/SolveServiceImpl.java similarity index 85% rename from src/service/SolveServiceImpl.java rename to src/main/java/store/zabbix/service/SolveServiceImpl.java index 59db908..a755618 100644 --- a/src/service/SolveServiceImpl.java +++ b/src/main/java/store/zabbix/service/SolveServiceImpl.java @@ -1,60 +1,60 @@ -package service; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import Pojo.QueryVo; -import Pojo.Solve; -import Pojo.Wrong; -import dao.SolveMapper; -import dao.WrongMapper; -@Service -@Transactional -public class SolveServiceImpl implements SolveService { - @Autowired - private SolveMapper solveMapper; - @Autowired - private WrongMapper wrongMapper; - @Override - public List selectall(QueryVo vo) { - List list=solveMapper.selectall(vo); - return list; - } - @Override - public Integer selectcount(QueryVo vo) { - Integer count=solveMapper.selectcount(vo); - return count; - } - @Override - public void deletesolve(Integer id) { - solveMapper.deletesolve(id); - - } - - @Override - public List findwrong(QueryVo vo) { - List list=wrongMapper.findwrong(vo); - return list; - } - @Override - public Wrong findbyid(Integer id) { - Wrong wrong=wrongMapper.findbyid(id); - return wrong; - } - @Override - public void insertwrong(Wrong wrong) { - wrong.setStatus("待处理"); - wrongMapper.insertwrong(wrong); - - } - @Override - public void gotosolve(Integer id, Solve solve) { - solveMapper.insertsolve(solve); - wrongMapper.deletewrong(id); - - } - -} +package store.zabbix.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import store.zabbix.pojo.QueryVo; +import store.zabbix.pojo.Solve; +import store.zabbix.pojo.Wrong; +import store.zabbix.dao.SolveMapper; +import store.zabbix.dao.WrongMapper; +@Service +@Transactional +public class SolveServiceImpl implements SolveService { + @Autowired + private SolveMapper solveMapper; + @Autowired + private WrongMapper wrongMapper; + @Override + public List selectall(QueryVo vo) { + List list=solveMapper.selectall(vo); + return list; + } + @Override + public Integer selectcount(QueryVo vo) { + Integer count=solveMapper.selectcount(vo); + return count; + } + @Override + public void deletesolve(Integer id) { + solveMapper.deletesolve(id); + + } + + @Override + public List findwrong(QueryVo vo) { + List list=wrongMapper.findwrong(vo); + return list; + } + @Override + public Wrong findbyid(Integer id) { + Wrong wrong=wrongMapper.findbyid(id); + return wrong; + } + @Override + public void insertwrong(Wrong wrong) { + wrong.setStatus("待处理"); + wrongMapper.insertwrong(wrong); + + } + @Override + public void gotosolve(Integer id, Solve solve) { + solveMapper.insertsolve(solve); + wrongMapper.deletewrong(id); + + } + +} diff --git a/src/service/TopaidService.java b/src/main/java/store/zabbix/service/TopaidService.java similarity index 64% rename from src/service/TopaidService.java rename to src/main/java/store/zabbix/service/TopaidService.java index 25c3cfb..3e0cddd 100644 --- a/src/service/TopaidService.java +++ b/src/main/java/store/zabbix/service/TopaidService.java @@ -1,14 +1,14 @@ -package service; - -import java.util.List; - -import Pojo.Paid; -import Pojo.QueryVo; -import Pojo.Topaid; - -public interface TopaidService { - public void inserttopaid(Topaid topaid); - public List findtopaid(QueryVo vo); - public Topaid findbyid(Integer id); - public void gotopay(Integer id,Paid paid); -} +package store.zabbix.service; + +import java.util.List; + +import store.zabbix.pojo.Paid; +import store.zabbix.pojo.QueryVo; +import store.zabbix.pojo.Topaid; + +public interface TopaidService { + public void inserttopaid(Topaid topaid); + public List findtopaid(QueryVo vo); + public Topaid findbyid(Integer id); + public void gotopay(Integer id,Paid paid); +} diff --git a/src/service/TopaidServiceImpl.java b/src/main/java/store/zabbix/service/TopaidServiceImpl.java similarity index 81% rename from src/service/TopaidServiceImpl.java rename to src/main/java/store/zabbix/service/TopaidServiceImpl.java index 969351d..cfbd355 100644 --- a/src/service/TopaidServiceImpl.java +++ b/src/main/java/store/zabbix/service/TopaidServiceImpl.java @@ -1,44 +1,44 @@ -package service; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import Pojo.Paid; -import Pojo.QueryVo; -import Pojo.Topaid; -import dao.PaidMapper; -import dao.TopaidMapper; - -@Service -@Transactional -public class TopaidServiceImpl implements TopaidService { - @Autowired - private TopaidMapper topaidMapper; - @Autowired - private PaidMapper paidMapper; - @Override - public void inserttopaid(Topaid topaid) { - topaid.setStatus("租金未缴"); - topaidMapper.inserttopaid(topaid); - } - @Override - public List findtopaid(QueryVo vo) { - List list=topaidMapper.findtopaid(vo); - return list; - } - @Override - public Topaid findbyid(Integer id) { - Topaid topaid=topaidMapper.findbyid(id); - return topaid; - } - @Override - public void gotopay(Integer id, Paid paid) { - paidMapper.insertpaid(paid); - topaidMapper.deletetopaid(id); - - } - -} +package store.zabbix.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import store.zabbix.pojo.Paid; +import store.zabbix.pojo.QueryVo; +import store.zabbix.pojo.Topaid; +import store.zabbix.dao.PaidMapper; +import store.zabbix.dao.TopaidMapper; + +@Service +@Transactional +public class TopaidServiceImpl implements TopaidService { + @Autowired + private TopaidMapper topaidMapper; + @Autowired + private PaidMapper paidMapper; + @Override + public void inserttopaid(Topaid topaid) { + topaid.setStatus("租金未缴"); + topaidMapper.inserttopaid(topaid); + } + @Override + public List findtopaid(QueryVo vo) { + List list=topaidMapper.findtopaid(vo); + return list; + } + @Override + public Topaid findbyid(Integer id) { + Topaid topaid=topaidMapper.findbyid(id); + return topaid; + } + @Override + public void gotopay(Integer id, Paid paid) { + paidMapper.insertpaid(paid); + topaidMapper.deletetopaid(id); + + } + +} diff --git a/src/service/UserService.java b/src/main/java/store/zabbix/service/UserService.java similarity index 69% rename from src/service/UserService.java rename to src/main/java/store/zabbix/service/UserService.java index 565a0eb..cbc414d 100644 --- a/src/service/UserService.java +++ b/src/main/java/store/zabbix/service/UserService.java @@ -1,13 +1,12 @@ -package service; - -import java.util.List; - -import Pojo.User; -import Pojo.Userlist; - -public interface UserService { - - public List userList() throws Exception; - public User login(User user) throws Exception; - -} +package store.zabbix.service; + +import java.util.List; + +import store.zabbix.pojo.User; + +public interface UserService { + + public List userList() throws Exception; + public User login(User user) throws Exception; + +} diff --git a/src/service/UserServiceImpl.java b/src/main/java/store/zabbix/service/UserServiceImpl.java similarity index 86% rename from src/service/UserServiceImpl.java rename to src/main/java/store/zabbix/service/UserServiceImpl.java index 3fc0096..e107898 100644 --- a/src/service/UserServiceImpl.java +++ b/src/main/java/store/zabbix/service/UserServiceImpl.java @@ -1,35 +1,35 @@ -package service; - -import java.util.List; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - - -import Pojo.*; -import dao.UserMapper; - -@Service -public class UserServiceImpl implements UserService{ - - @Autowired - private UserMapper userMapper; - - @Override - public List userList() throws Exception { - // TODO Auto-generated method stub - UserExample example=new UserExample(); - List list=userMapper.selectByExample(example); - System.out.println("123"+list); - return list; - } - - @Override - public User login(User user) throws Exception { - User user1=userMapper.selectByUser(user); - return user1; - } - - -} +package store.zabbix.service; + +import java.util.List; + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +import store.zabbix.pojo.*; +import store.zabbix.dao.UserMapper; + +@Service +public class UserServiceImpl implements UserService{ + + @Autowired + private UserMapper userMapper; + + @Override + public List userList() throws Exception { + // TODO Auto-generated method stub + UserExample example=new UserExample(); + List list=userMapper.selectByExample(example); + System.out.println("123"+list); + return list; + } + + @Override + public User login(User user) throws Exception { + User user1=userMapper.selectByUser(user); + return user1; + } + + +} diff --git a/src/service/UserlistService.java b/src/main/java/store/zabbix/service/UserlistService.java similarity index 89% rename from src/service/UserlistService.java rename to src/main/java/store/zabbix/service/UserlistService.java index 41fde52..605167a 100644 --- a/src/service/UserlistService.java +++ b/src/main/java/store/zabbix/service/UserlistService.java @@ -1,20 +1,20 @@ -package service; - -import java.util.List; - -import Pojo.Userlist; - -public interface UserlistService { - Userlist findhasuserlist(Integer user_id); - Userlist checkuserlist(String idcard); - void insertuserlist(Userlist userlist); - void updateuserlist(Userlist userlist); - Userlist finduserlistupdate(Userlist userlist); - public List getUserzuList(Integer id); - public List getmycheckout(Integer id); - public List getmyapply(Integer id); - public List getmyapplyout(Integer id); - public List findalluserlist(); - - public void deleteuserlist(Integer id); -} +package store.zabbix.service; + +import java.util.List; + +import store.zabbix.pojo.Userlist; + +public interface UserlistService { + Userlist findhasuserlist(Integer user_id); + Userlist checkuserlist(String idcard); + void insertuserlist(Userlist userlist); + void updateuserlist(Userlist userlist); + Userlist finduserlistupdate(Userlist userlist); + public List getUserzuList(Integer id); + public List getmycheckout(Integer id); + public List getmyapply(Integer id); + public List getmyapplyout(Integer id); + public List findalluserlist(); + + public void deleteuserlist(Integer id); +} diff --git a/src/service/UserlistServiceImpl.java b/src/main/java/store/zabbix/service/UserlistServiceImpl.java similarity index 92% rename from src/service/UserlistServiceImpl.java rename to src/main/java/store/zabbix/service/UserlistServiceImpl.java index 3b79c72..d8605fa 100644 --- a/src/service/UserlistServiceImpl.java +++ b/src/main/java/store/zabbix/service/UserlistServiceImpl.java @@ -1,78 +1,78 @@ -package service; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import Pojo.Userlist; -import dao.UserlistMapper; - -@Service -@Transactional -public class UserlistServiceImpl implements UserlistService { - - @Autowired - private UserlistMapper userlistMapper; - @Override - public Userlist findhasuserlist(Integer user_id) { - Userlist userlist=userlistMapper.findhasuserlist(user_id); - return userlist; - } - @Override - public Userlist checkuserlist(String idcard) { - Userlist userlist=userlistMapper.checkuserlist(idcard); - return userlist; - } - @Override - public void insertuserlist(Userlist userlist) { - userlistMapper.insertuserlist(userlist); - - } - @Override - public void updateuserlist(Userlist userlist) { - userlistMapper.updateuserlist(userlist); - - } - @Override - public Userlist finduserlistupdate(Userlist userlist) { - Userlist list=userlistMapper.finduserlistupdate(userlist); - return list; - } - @Override - public List getUserzuList(Integer id) { - List userlist=userlistMapper.getUserzuList(id); - for(Userlist list:userlist){ - System.out.println(list); - } - return userlist; - } - @Override - public List getmycheckout(Integer id) { - List list=userlistMapper.getmycheckout(id); - return list; - } - @Override - public List getmyapply(Integer id) { - List list=userlistMapper.getmyapply(id); - return list; - } - @Override - public List getmyapplyout(Integer id) { - List list=userlistMapper.getmyapplyout(id); - return list; - } - @Override - public List findalluserlist() { - List list=userlistMapper.findalluserlist(); - return list; - } - - @Override - public void deleteuserlist(Integer id) { - userlistMapper.deleteuserlist(id); - userlistMapper.deleteuser(id); - } - -} +package store.zabbix.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import store.zabbix.pojo.Userlist; +import store.zabbix.dao.UserlistMapper; + +@Service +@Transactional +public class UserlistServiceImpl implements UserlistService { + + @Autowired + private UserlistMapper userlistMapper; + @Override + public Userlist findhasuserlist(Integer user_id) { + Userlist userlist=userlistMapper.findhasuserlist(user_id); + return userlist; + } + @Override + public Userlist checkuserlist(String idcard) { + Userlist userlist=userlistMapper.checkuserlist(idcard); + return userlist; + } + @Override + public void insertuserlist(Userlist userlist) { + userlistMapper.insertuserlist(userlist); + + } + @Override + public void updateuserlist(Userlist userlist) { + userlistMapper.updateuserlist(userlist); + + } + @Override + public Userlist finduserlistupdate(Userlist userlist) { + Userlist list=userlistMapper.finduserlistupdate(userlist); + return list; + } + @Override + public List getUserzuList(Integer id) { + List userlist=userlistMapper.getUserzuList(id); + for(Userlist list:userlist){ + System.out.println(list); + } + return userlist; + } + @Override + public List getmycheckout(Integer id) { + List list=userlistMapper.getmycheckout(id); + return list; + } + @Override + public List getmyapply(Integer id) { + List list=userlistMapper.getmyapply(id); + return list; + } + @Override + public List getmyapplyout(Integer id) { + List list=userlistMapper.getmyapplyout(id); + return list; + } + @Override + public List findalluserlist() { + List list=userlistMapper.findalluserlist(); + return list; + } + + @Override + public void deleteuserlist(Integer id) { + userlistMapper.deleteuserlist(id); + userlistMapper.deleteuser(id); + } + +} diff --git a/src/service/ZulistService.java b/src/main/java/store/zabbix/service/ZulistService.java similarity index 82% rename from src/service/ZulistService.java rename to src/main/java/store/zabbix/service/ZulistService.java index 6e4ad62..6da4a36 100644 --- a/src/service/ZulistService.java +++ b/src/main/java/store/zabbix/service/ZulistService.java @@ -1,13 +1,13 @@ -package service; - -import java.util.List; - -import Pojo.Zulist; - -public interface ZulistService { - public void insertzulist(Zulist zulist); - public List findzuuserlist() throws Exception; - public Zulist findzulist(String house_id); - public void deletezulist(String house_id); - public List findzulistbyuid(Integer userlist_id); -} +package store.zabbix.service; + +import java.util.List; + +import store.zabbix.pojo.Zulist; + +public interface ZulistService { + public void insertzulist(Zulist zulist); + public List findzuuserlist() throws Exception; + public Zulist findzulist(String house_id); + public void deletezulist(String house_id); + public List findzulistbyuid(Integer userlist_id); +} diff --git a/src/service/ZulistServiceImpl.java b/src/main/java/store/zabbix/service/ZulistServiceImpl.java similarity index 86% rename from src/service/ZulistServiceImpl.java rename to src/main/java/store/zabbix/service/ZulistServiceImpl.java index 4d1e04f..7145f73 100644 --- a/src/service/ZulistServiceImpl.java +++ b/src/main/java/store/zabbix/service/ZulistServiceImpl.java @@ -1,49 +1,48 @@ -package service; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import Pojo.Zulist; -import dao.HouselistMapper; -import dao.ZulistMapper; - -@Service -public class ZulistServiceImpl implements ZulistService { - - @Autowired - private ZulistMapper zulistMapper; - - @Override - public void insertzulist(Zulist zulist) { - zulistMapper.insertzulist(zulist); - - } - - @Override - public List findzuuserlist() throws Exception { - List zulist=zulistMapper.findzuuserlist(); - - return zulist; - } - - @Override - public Zulist findzulist(String house_id) { - Zulist zulist=zulistMapper.findzulist(house_id); - return zulist; - } - - @Override - public void deletezulist(String house_id) { - zulistMapper.deletezulist(house_id); - - } - - @Override - public List findzulistbyuid(Integer userlist_id) { - List zulist=zulistMapper.findzulistbyuid(userlist_id); - return zulist; - } - -} +package store.zabbix.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import store.zabbix.pojo.Zulist; +import store.zabbix.dao.ZulistMapper; + +@Service +public class ZulistServiceImpl implements ZulistService { + + @Autowired + private ZulistMapper zulistMapper; + + @Override + public void insertzulist(Zulist zulist) { + zulistMapper.insertzulist(zulist); + + } + + @Override + public List findzuuserlist() throws Exception { + List zulist=zulistMapper.findzuuserlist(); + + return zulist; + } + + @Override + public Zulist findzulist(String house_id) { + Zulist zulist=zulistMapper.findzulist(house_id); + return zulist; + } + + @Override + public void deletezulist(String house_id) { + zulistMapper.deletezulist(house_id); + + } + + @Override + public List findzulistbyuid(Integer userlist_id) { + List zulist=zulistMapper.findzulistbyuid(userlist_id); + return zulist; + } + +} diff --git a/src/main/resources/db.properties b/src/main/resources/db.properties new file mode 100644 index 0000000..228effe --- /dev/null +++ b/src/main/resources/db.properties @@ -0,0 +1,4 @@ +jdbc.driver=com.mysql.jdbc.Driver +jdbc.url=jdbc:mysql://tools-jdbc:3306/zu?characterEncoding=utf-8 +jdbc.username=root +jdbc.password=SexSexSex666 \ No newline at end of file diff --git a/src/log4j.properties b/src/main/resources/log4j.properties similarity index 98% rename from src/log4j.properties rename to src/main/resources/log4j.properties index 3dfc7f5..90c2707 100644 --- a/src/log4j.properties +++ b/src/main/resources/log4j.properties @@ -1,6 +1,6 @@ -# Global logging configuration -log4j.rootLogger=DEBUG, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +# Global logging configuration +log4j.rootLogger=DEBUG, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%t] - %m%n \ No newline at end of file diff --git a/src/dao/ApplyMapper.xml b/src/main/resources/mapper/ApplyMapper.xml similarity index 84% rename from src/dao/ApplyMapper.xml rename to src/main/resources/mapper/ApplyMapper.xml index bb9baa9..0a95514 100644 --- a/src/dao/ApplyMapper.xml +++ b/src/main/resources/mapper/ApplyMapper.xml @@ -1,41 +1,41 @@ - - - - - - - - - - - - - - - - - - - - - - - insert into apply(house_id,address,price,area,status,userlist_id) - values(#{house_id},#{address},#{price},#{area},#{status},#{userlist_id}) - - - - - - delete from apply where house_id=#{house_id} - + + + + + + + + + + + + + + + + + + + + + + + insert into apply(house_id,address,price,area,status,userlist_id) + values(#{house_id},#{address},#{price},#{area},#{status},#{userlist_id}) + + + + + + delete from apply where house_id=#{house_id} + \ No newline at end of file diff --git a/src/dao/ApplyoutMapper.xml b/src/main/resources/mapper/ApplyoutMapper.xml similarity index 74% rename from src/dao/ApplyoutMapper.xml rename to src/main/resources/mapper/ApplyoutMapper.xml index feb6d50..d4a5737 100644 --- a/src/dao/ApplyoutMapper.xml +++ b/src/main/resources/mapper/ApplyoutMapper.xml @@ -1,48 +1,48 @@ - - - - - - - - - - - - - - - - - - - - - - - - - insert into applyout(house_id,address,status,userlist_id) - values(#{house_id},#{address},#{status},#{userlist_id}) - - - update applyout set status=#{status} - where aoid=#{id} - - - update applyout set status=#{status} - where house_id=#{house_id} - - - delete from applyout where aoid=#{aoid} - + + + + + + + + + + + + + + + + + + + + + + + + + insert into applyout(house_id,address,status,userlist_id) + values(#{house_id},#{address},#{status},#{userlist_id}) + + + update applyout set status=#{status} + where aoid=#{id} + + + update applyout set status=#{status} + where house_id=#{house_id} + + + delete from applyout where aoid=#{aoid} + \ No newline at end of file diff --git a/src/dao/CheckoutMapper.xml b/src/main/resources/mapper/CheckoutMapper.xml similarity index 82% rename from src/dao/CheckoutMapper.xml rename to src/main/resources/mapper/CheckoutMapper.xml index 670d8e2..6f5513b 100644 --- a/src/dao/CheckoutMapper.xml +++ b/src/main/resources/mapper/CheckoutMapper.xml @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - insert into checkout(house_id,address,userlist_id,status) - values(#{house_id},#{address},#{userlist_id},#{status}) - - - - delete from checkout where cid=#{cid} - + + + + + + + + + + + + + + + + + + + + + + + insert into checkout(house_id,address,userlist_id,status) + values(#{house_id},#{address},#{userlist_id},#{status}) + + + + delete from checkout where cid=#{cid} + \ No newline at end of file diff --git a/src/dao/HetongMapper.xml b/src/main/resources/mapper/HetongMapper.xml similarity index 82% rename from src/dao/HetongMapper.xml rename to src/main/resources/mapper/HetongMapper.xml index 7e59012..3dcfb5a 100644 --- a/src/dao/HetongMapper.xml +++ b/src/main/resources/mapper/HetongMapper.xml @@ -1,32 +1,32 @@ - - - - - - - - - - - - - - - - - - - insert into hetong(house_id,address,payday,price,chuzu,chuzu_idcard,zuke,zuke_idcard,fromdate,todate) - values(#{house_id},#{address},#{payday},#{price},#{chuzu},#{chuzu_idcard},#{zuke},#{zuke_idcard},#{fromdate},#{todate}) - - - update hetong set address=#{address},payday=#{payday},price=#{price},chuzu=#{chuzu},chuzu_idcard=#{chuzu_idcard}, - zuke=#{zuke},zuke_idcard=#{zuke_idcard},fromdate=#{fromdate},todate=#{todate} - where house_id=#{house_id} - - - delete from hetong where house_id=#{house_id} - + + + + + + + + + + + + + + + + + + + insert into hetong(house_id,address,payday,price,chuzu,chuzu_idcard,zuke,zuke_idcard,fromdate,todate) + values(#{house_id},#{address},#{payday},#{price},#{chuzu},#{chuzu_idcard},#{zuke},#{zuke_idcard},#{fromdate},#{todate}) + + + update hetong set address=#{address},payday=#{payday},price=#{price},chuzu=#{chuzu},chuzu_idcard=#{chuzu_idcard}, + zuke=#{zuke},zuke_idcard=#{zuke_idcard},fromdate=#{fromdate},todate=#{todate} + where house_id=#{house_id} + + + delete from hetong where house_id=#{house_id} + \ No newline at end of file diff --git a/src/dao/HouselistMapper.xml b/src/main/resources/mapper/HouselistMapper.xml similarity index 73% rename from src/dao/HouselistMapper.xml rename to src/main/resources/mapper/HouselistMapper.xml index bba3c00..923a887 100644 --- a/src/dao/HouselistMapper.xml +++ b/src/main/resources/mapper/HouselistMapper.xml @@ -1,89 +1,89 @@ - - - - - - - - - - - - - - - - - update houselist set houseid=#{houseid},address=#{address},area=#{area},price=#{price},status=#{status} - where id=#{id} - - - update houselist set status=#{status} - where id=#{id} - - - update houselist set status=#{status} - where houseid=#{houseid} - - - - insert into houselist(houseid,address,area,price,status) - values(#{houseid},#{address},#{area},#{price},#{status}) - - - - delete from houselist where id=#{id} - - - delete from houselist where houseid=#{houseid} - + + + + + + + + + + + + + + + + + update houselist set houseid=#{houseid},address=#{address},area=#{area},price=#{price},status=#{status} + where id=#{id} + + + update houselist set status=#{status} + where id=#{id} + + + update houselist set status=#{status} + where houseid=#{houseid} + + + + insert into houselist(houseid,address,area,price,status) + values(#{houseid},#{address},#{area},#{price},#{status}) + + + + delete from houselist where id=#{id} + + + delete from houselist where houseid=#{houseid} + \ No newline at end of file diff --git a/src/dao/PaidMapper.xml b/src/main/resources/mapper/PaidMapper.xml similarity index 86% rename from src/dao/PaidMapper.xml rename to src/main/resources/mapper/PaidMapper.xml index 1789230..2b0d841 100644 --- a/src/dao/PaidMapper.xml +++ b/src/main/resources/mapper/PaidMapper.xml @@ -1,62 +1,62 @@ - - - - - - - - - - - - - - - - - - delete from paid where id=#{id} - - - insert into paid(house_id,address,price,date,paydate,status,name,userlist_id) - values(#{house_id},#{address},#{price},#{date},#{paydate},#{status},#{name},#{userlist_id}) - + + + + + + + + + + + + + + + + + + delete from paid where id=#{id} + + + insert into paid(house_id,address,price,date,paydate,status,name,userlist_id) + values(#{house_id},#{address},#{price},#{date},#{paydate},#{status},#{name},#{userlist_id}) + \ No newline at end of file diff --git a/src/dao/ScheduleMapper.xml b/src/main/resources/mapper/ScheduleMapper.xml similarity index 68% rename from src/dao/ScheduleMapper.xml rename to src/main/resources/mapper/ScheduleMapper.xml index 99e9628..b451e21 100644 --- a/src/dao/ScheduleMapper.xml +++ b/src/main/resources/mapper/ScheduleMapper.xml @@ -1,29 +1,29 @@ - - - - - - - - - - - insert into schedule(date,content) - values(#{date},#{content}) - - - - - delete from schedule where id=#{id} - - - update schedule set date=#{date},content=#{content} - where id=#{id} - + + + + + + + + + + + insert into schedule(date,content) + values(#{date},#{content}) + + + + + delete from schedule where id=#{id} + + + update schedule set date=#{date},content=#{content} + where id=#{id} + \ No newline at end of file diff --git a/src/dao/SolveMapper.xml b/src/main/resources/mapper/SolveMapper.xml similarity index 86% rename from src/dao/SolveMapper.xml rename to src/main/resources/mapper/SolveMapper.xml index 1fc1bb4..a3690a9 100644 --- a/src/dao/SolveMapper.xml +++ b/src/main/resources/mapper/SolveMapper.xml @@ -1,65 +1,65 @@ - - - - - - - - - - - - - - - - - - delete from solve where id=#{id} - - - insert into solve(house_id,address,date,detail,status,name,userlist_id) - values(#{house_id},#{address},#{date},#{detail},#{status},#{name},#{userlist_id}) - + + + + + + + + + + + + + + + + + + delete from solve where id=#{id} + + + insert into solve(house_id,address,date,detail,status,name,userlist_id) + values(#{house_id},#{address},#{date},#{detail},#{status},#{name},#{userlist_id}) + \ No newline at end of file diff --git a/src/dao/TopaidMapper.xml b/src/main/resources/mapper/TopaidMapper.xml similarity index 76% rename from src/dao/TopaidMapper.xml rename to src/main/resources/mapper/TopaidMapper.xml index 22e68ca..e54e5fd 100644 --- a/src/dao/TopaidMapper.xml +++ b/src/main/resources/mapper/TopaidMapper.xml @@ -1,37 +1,37 @@ - - - - - - - - - - - - - - - - insert into topaid(house_id,address,price,date,status,name,userlist_id) - values(#{house_id},#{address},#{price},#{date},#{status},#{name},#{userlist_id}) - - - - - - delete from topaid where id=#{id} - + + + + + + + + + + + + + + + + insert into topaid(house_id,address,price,date,status,name,userlist_id) + values(#{house_id},#{address},#{price},#{date},#{status},#{name},#{userlist_id}) + + + + + + delete from topaid where id=#{id} + \ No newline at end of file diff --git a/src/dao/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml similarity index 89% rename from src/dao/UserMapper.xml rename to src/main/resources/mapper/UserMapper.xml index e29482a..e21be36 100644 --- a/src/dao/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -1,214 +1,214 @@ - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, username, password, type - - - - - - delete from user - where id = #{id,jdbcType=INTEGER} - - - delete from user - - - - - - insert into user (id, username, password, - type) - values (#{id,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, - #{type,jdbcType=VARCHAR}) - - - insert into user - - - id, - - - username, - - - password, - - - type, - - - - - #{id,jdbcType=INTEGER}, - - - #{username,jdbcType=VARCHAR}, - - - #{password,jdbcType=VARCHAR}, - - - #{type,jdbcType=VARCHAR}, - - - - - - update user - - - id = #{record.id,jdbcType=INTEGER}, - - - username = #{record.username,jdbcType=VARCHAR}, - - - password = #{record.password,jdbcType=VARCHAR}, - - - type = #{record.type,jdbcType=VARCHAR}, - - - - - - - - update user - set id = #{record.id,jdbcType=INTEGER}, - username = #{record.username,jdbcType=VARCHAR}, - password = #{record.password,jdbcType=VARCHAR}, - type = #{record.type,jdbcType=VARCHAR} - - - - - - update user - - - username = #{username,jdbcType=VARCHAR}, - - - password = #{password,jdbcType=VARCHAR}, - - - type = #{type,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update user - set username = #{username,jdbcType=VARCHAR}, - password = #{password,jdbcType=VARCHAR}, - type = #{type,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, username, password, type + + + + + + delete from user + where id = #{id,jdbcType=INTEGER} + + + delete from user + + + + + + insert into user (id, username, password, + type) + values (#{id,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, + #{type,jdbcType=VARCHAR}) + + + insert into user + + + id, + + + username, + + + password, + + + type, + + + + + #{id,jdbcType=INTEGER}, + + + #{username,jdbcType=VARCHAR}, + + + #{password,jdbcType=VARCHAR}, + + + #{type,jdbcType=VARCHAR}, + + + + + + update user + + + id = #{record.id,jdbcType=INTEGER}, + + + username = #{record.username,jdbcType=VARCHAR}, + + + password = #{record.password,jdbcType=VARCHAR}, + + + type = #{record.type,jdbcType=VARCHAR}, + + + + + + + + update user + set id = #{record.id,jdbcType=INTEGER}, + username = #{record.username,jdbcType=VARCHAR}, + password = #{record.password,jdbcType=VARCHAR}, + type = #{record.type,jdbcType=VARCHAR} + + + + + + update user + + + username = #{username,jdbcType=VARCHAR}, + + + password = #{password,jdbcType=VARCHAR}, + + + type = #{type,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=INTEGER} + + + update user + set username = #{username,jdbcType=VARCHAR}, + password = #{password,jdbcType=VARCHAR}, + type = #{type,jdbcType=VARCHAR} + where id = #{id,jdbcType=INTEGER} + \ No newline at end of file diff --git a/src/dao/UserlistMapper.xml b/src/main/resources/mapper/UserlistMapper.xml similarity index 83% rename from src/dao/UserlistMapper.xml rename to src/main/resources/mapper/UserlistMapper.xml index f0a45c3..6d4ae7d 100644 --- a/src/dao/UserlistMapper.xml +++ b/src/main/resources/mapper/UserlistMapper.xml @@ -1,150 +1,150 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - delete from user where id=#{id} - - - delete from userlist where user_id=#{id} - - - - - - - insert into userlist(name,idcard,phone,user_id) - values(#{name},#{idcard},#{phone},#{user_id}) - - - - update userlist set name=#{name},idcard=#{idcard},phone=#{phone} - where id=#{id} - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + delete from user where id=#{id} + + + delete from userlist where user_id=#{id} + + + + + + + insert into userlist(name,idcard,phone,user_id) + values(#{name},#{idcard},#{phone},#{user_id}) + + + + update userlist set name=#{name},idcard=#{idcard},phone=#{phone} + where id=#{id} + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/WrongMapper.xml b/src/main/resources/mapper/WrongMapper.xml new file mode 100644 index 0000000..42a8ad0 --- /dev/null +++ b/src/main/resources/mapper/WrongMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + insert into wrong(house_id,address,date,detail,status,name,userlist_id) + values(#{house_id},#{address},#{date},#{detail},#{status},#{name},#{userlist_id}) + + + delete from wrong where id=#{id} + + \ No newline at end of file diff --git a/src/dao/ZulistMapper.xml b/src/main/resources/mapper/ZulistMapper.xml similarity index 84% rename from src/dao/ZulistMapper.xml rename to src/main/resources/mapper/ZulistMapper.xml index 9b91078..2d15e5c 100644 --- a/src/dao/ZulistMapper.xml +++ b/src/main/resources/mapper/ZulistMapper.xml @@ -1,57 +1,57 @@ - - - - - - - - - - - - - - - - - - - - - - - insert into zulist(house_id,price,address,userlist_id,contract_id) - values(#{house_id},#{price},#{address},#{userlist_id},#{contract_id}) - - - - - - - delete from zulist where house_id=#{house_id} - + + + + + + + + + + + + + + + + + + + + + + + insert into zulist(house_id,price,address,userlist_id,contract_id) + values(#{house_id},#{price},#{address},#{userlist_id},#{contract_id}) + + + + + + + delete from zulist where house_id=#{house_id} + \ No newline at end of file diff --git a/src/main/resources/mybatis-config.xml b/src/main/resources/mybatis-config.xml new file mode 100644 index 0000000..c50ff76 --- /dev/null +++ b/src/main/resources/mybatis-config.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/spring/spring-dao.xml b/src/main/resources/spring/spring-dao.xml new file mode 100644 index 0000000..74a2c07 --- /dev/null +++ b/src/main/resources/spring/spring-dao.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/spring/spring-mvc.xml b/src/main/resources/spring/spring-mvc.xml new file mode 100644 index 0000000..48fb873 --- /dev/null +++ b/src/main/resources/spring/spring-mvc.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/spring/spring-service.xml b/src/main/resources/spring/spring-service.xml new file mode 100644 index 0000000..4b62869 --- /dev/null +++ b/src/main/resources/spring/spring-service.xml @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/spring/spring-trans.xml b/src/main/resources/spring/spring-trans.xml new file mode 100644 index 0000000..831a772 --- /dev/null +++ b/src/main/resources/spring/spring-trans.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebContent/META-INF/MANIFEST.MF b/src/main/webapp/META-INF/MANIFEST.MF similarity index 92% rename from WebContent/META-INF/MANIFEST.MF rename to src/main/webapp/META-INF/MANIFEST.MF index 5e94951..254272e 100644 --- a/WebContent/META-INF/MANIFEST.MF +++ b/src/main/webapp/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ -Manifest-Version: 1.0 -Class-Path: - +Manifest-Version: 1.0 +Class-Path: + diff --git a/WebContent/WEB-INF/jsp/admin/addhetong.jsp b/src/main/webapp/WEB-INF/jsp/admin/addhetong.jsp similarity index 91% rename from WebContent/WEB-INF/jsp/admin/addhetong.jsp rename to src/main/webapp/WEB-INF/jsp/admin/addhetong.jsp index 4053a4f..9aad669 100644 --- a/WebContent/WEB-INF/jsp/admin/addhetong.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/addhetong.jsp @@ -1,205 +1,205 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - - - - - - - 房屋租赁系统 - - - - - - - - - - - - - -
-

添加合同信息，请确定合同信息正确无误再提交！

-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${error } - -
*房屋id： - -
*地址：
*出租方（甲方）：
*出租方（甲方）证件号码：
*承租方（乙方）：
*承租方（乙方）证件号码：
*起租时间：
*退租时间：
*每月租金：
*每月交租日（数字）：
- - -
-
-
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + + + + 房屋租赁系统 + + + + + + + + + + + + + +
+

添加合同信息，请确定合同信息正确无误再提交！

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${error } + +
*房屋id： + +
*地址：
*出租方（甲方）：
*出租方（甲方）证件号码：
*承租方（乙方）：
*承租方（乙方）证件号码：
*起租时间：
*退租时间：
*每月租金：
*每月交租日（数字）：
+ + +
+
+
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/addhouse.jsp b/src/main/webapp/WEB-INF/jsp/admin/addhouse.jsp similarity index 91% rename from WebContent/WEB-INF/jsp/admin/addhouse.jsp rename to src/main/webapp/WEB-INF/jsp/admin/addhouse.jsp index e73c31e..313aeec 100644 --- a/WebContent/WEB-INF/jsp/admin/addhouse.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/addhouse.jsp @@ -1,133 +1,133 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - - - - - - - 房屋租赁系统 - - - - - - - - - - - -
-

添加房源

-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - ${error } - -
*房屋id： - -
*地址：
*面积：
*租金：
*状态： - -
- - -
-
-
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + + + + 房屋租赁系统 + + + + + + + + + + + +
+

添加房源

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + ${error } + +
*房屋id： + +
*地址：
*面积：
*租金：
*状态： + +
+ + +
+
+
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/addpaid.jsp b/src/main/webapp/WEB-INF/jsp/admin/addpaid.jsp similarity index 86% rename from WebContent/WEB-INF/jsp/admin/addpaid.jsp rename to src/main/webapp/WEB-INF/jsp/admin/addpaid.jsp index a792494..336a9db 100644 --- a/WebContent/WEB-INF/jsp/admin/addpaid.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/addpaid.jsp @@ -1,110 +1,110 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - - - - - - - 房屋租赁系统 - - - - - - - - - - - - - -
-

添加收租信息

-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - ${error } - -
*房屋id： - -
*地址：
*租客姓名：
*租金交付截止日期：
*应缴租金：
- - -
-
-
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + + + + 房屋租赁系统 + + + + + + + + + + + + + +
+

添加收租信息

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + ${error } + +
*房屋id： + +
*地址：
*租客姓名：
*租金交付截止日期：
*应缴租金：
+ + +
+
+
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/addschedule.jsp b/src/main/webapp/WEB-INF/jsp/admin/addschedule.jsp similarity index 82% rename from WebContent/WEB-INF/jsp/admin/addschedule.jsp rename to src/main/webapp/WEB-INF/jsp/admin/addschedule.jsp index bbc86ae..2fec010 100644 --- a/WebContent/WEB-INF/jsp/admin/addschedule.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/addschedule.jsp @@ -1,101 +1,101 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - - - - - - - 房屋租赁系统 - - - - - - - - - - - - - -
-

添加日程

-
-
-
-
- - - - - - - - - - - - - - - - - ${error } - -
*日期： - -
*日程：
- - -
-
-
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + + + + 房屋租赁系统 + + + + + + + + + + + + + +
+

添加日程

+
+
+
+
+ + + + + + + + + + + + + + + + + ${error } + +
*日期： + +
*日程：
+ + +
+
+
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/ahouselist.jsp b/src/main/webapp/WEB-INF/jsp/admin/ahouselist.jsp similarity index 89% rename from WebContent/WEB-INF/jsp/admin/ahouselist.jsp rename to src/main/webapp/WEB-INF/jsp/admin/ahouselist.jsp index a37a3ab..75d3067 100644 --- a/WebContent/WEB-INF/jsp/admin/ahouselist.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/ahouselist.jsp @@ -1,123 +1,123 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - -
-
-

房源列表

-
-
-
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址面积价格状态操作
${houselist.houseid }${houselist.address}${houselist.area}${houselist.price}${houselist.status}修改 -    - - 删除
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + +
+
+

房源列表

+
+
+
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址面积价格状态操作
${houselist.houseid }${houselist.address}${houselist.area}${houselist.price}${houselist.status}修改 +    + + 删除
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/applylist.jsp b/src/main/webapp/WEB-INF/jsp/admin/applylist.jsp similarity index 86% rename from WebContent/WEB-INF/jsp/admin/applylist.jsp rename to src/main/webapp/WEB-INF/jsp/admin/applylist.jsp index e2fd321..47209ec 100644 --- a/WebContent/WEB-INF/jsp/admin/applylist.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/applylist.jsp @@ -1,133 +1,133 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - -
-

申请看房列表

-
- -
-
-
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址面积价格申请人姓名申请人身份证号申请人电话号码操作
${apply.house_id }${apply.address}${apply.area}${apply.price}${apply.userlist.name}${apply.userlist.idcard}${apply.userlist.phone} - 同意租赁 -    - - 拒绝租赁
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + +
+

申请看房列表

+
+ +
+
+
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址面积价格申请人姓名申请人身份证号申请人电话号码操作
${apply.house_id }${apply.address}${apply.area}${apply.price}${apply.userlist.name}${apply.userlist.idcard}${apply.userlist.phone} + 同意租赁 +    + + 拒绝租赁
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/applyout.jsp b/src/main/webapp/WEB-INF/jsp/admin/applyout.jsp similarity index 85% rename from WebContent/WEB-INF/jsp/admin/applyout.jsp rename to src/main/webapp/WEB-INF/jsp/admin/applyout.jsp index b3027bf..e6cb25e 100644 --- a/WebContent/WEB-INF/jsp/admin/applyout.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/applyout.jsp @@ -1,151 +1,151 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - -
-
-

退租申请

-
-
-
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址状态申请人申请人身份证号申请人联系电话操作
${applyout.house_id}${applyout.address}${applyout.status}${userlist.name}${userlist.idcard}${userlist.phone} - - - 同意 -    - - 拒绝 - - - 删除 - - -
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + +
+
+

退租申请

+
+
+
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址状态申请人申请人身份证号申请人联系电话操作
${applyout.house_id}${applyout.address}${applyout.status}${userlist.name}${userlist.idcard}${userlist.phone} + + + 同意 +    + + 拒绝 + + + 删除 + + +
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/changehouse.jsp b/src/main/webapp/WEB-INF/jsp/admin/changehouse.jsp similarity index 91% rename from WebContent/WEB-INF/jsp/admin/changehouse.jsp rename to src/main/webapp/WEB-INF/jsp/admin/changehouse.jsp index b0c97f8..85b9768 100644 --- a/WebContent/WEB-INF/jsp/admin/changehouse.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/changehouse.jsp @@ -1,134 +1,134 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - - - - - - - 房屋租赁系统 - - - - - - - - - - - -
-

更新房源

-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - ${error } - -
*房屋id： - -
*地址：
*面积：
*租金：
*状态： - -
- - -
-
-
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + + + + 房屋租赁系统 + + + + + + + + + + + +
+

更新房源

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + ${error } + +
*房屋id： + +
*地址：
*面积：
*租金：
*状态： + +
+ + +
+
+
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/checkout.jsp b/src/main/webapp/WEB-INF/jsp/admin/checkout.jsp similarity index 86% rename from WebContent/WEB-INF/jsp/admin/checkout.jsp rename to src/main/webapp/WEB-INF/jsp/admin/checkout.jsp index 75fb2d6..c705fb1 100644 --- a/WebContent/WEB-INF/jsp/admin/checkout.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/checkout.jsp @@ -1,134 +1,134 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - -
-

已退租列表

-
- -
-
-
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址申请人姓名申请人身份证号申请人电话号码状态操作
${checkout.house_id }${checkout.address}${checkout.userlist.name}${checkout.userlist.idcard}${checkout.userlist.phone}${checkout.status} - - - 删除
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + +
+

已退租列表

+
+ +
+
+
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址申请人姓名申请人身份证号申请人电话号码状态操作
${checkout.house_id }${checkout.address}${checkout.userlist.name}${checkout.userlist.idcard}${checkout.userlist.phone}${checkout.status} + + + 删除
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/hetong.jsp b/src/main/webapp/WEB-INF/jsp/admin/hetong.jsp similarity index 84% rename from WebContent/WEB-INF/jsp/admin/hetong.jsp rename to src/main/webapp/WEB-INF/jsp/admin/hetong.jsp index 2b2cd6e..0a03405 100644 --- a/WebContent/WEB-INF/jsp/admin/hetong.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/hetong.jsp @@ -1,66 +1,66 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - - - - -Insert title here - - - - - - - - - - - -

-
-
房屋租赁合同
- -

出租方：${hetong.chuzu}（以下简称甲方）；

　　　 -

承租方：${hetong.zuke}（以下简称乙方）。　

　 -

租赁房屋地址：${hetong.address}　

　 -

依据《中华人民共和国合同法》有关条款，甲乙双方经过充分协商，就乙方租赁甲方房屋事宜达成如下协议：

-

一、乙方租赁甲方房屋，以下简称租赁房屋。

-

二、起租时间：${hetong.fromdate}，退租时间：${hetong.todate}。 - 在合同签订之日，乙方需向甲方支付房屋租金￥${hetong.price}。如续租，请提前3天通知甲方，并重新办理租赁手续。

　　　　 -

三、违约处理：

　 -

甲方违约：

　 -

1．如甲方未能及时将押金退还乙方，甲方每天应按押金的2％向乙方支付违约金；

-

2．如甲方提供的维修服务项目与协议不相符，乙方有权提前退租，甲方应全额退还剩余的租金。

-

乙方违约：

　　 -

1．如乙方不按时缴纳租金，甲方有权在其押金中扣除，同时收回房屋，所有损失由乙方负责；

　 -

2．如果乙方在租赁期限未满时退租，甲方仅退还剩余租金的40％（租期未满一个月的不在此例）；

　 -

四、本协议书一式两份，甲乙双方各执一份；本协议甲乙双方签字后生效。补充协议亦属于合同的一部分。

　 - 　
　　甲方（盖章）：_________　　　　　　　　乙方（盖章）：_________　　
　 - 　法定代表人（签字）：_________　　　　　法定代表人（签字）：_________　　
　　 - 担保人（签章）：_________　　
　　 - _________年____月____日　　　　　　　　_________年____月____日　　
　　 - 签订地点：_________　　　　　　　　　　签订地点：_________ -
- - - -
-
-
- +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + + + + +Insert title here + + + + + + + + + + + +

+
+
房屋租赁合同
+ +

出租方：${hetong.chuzu}（以下简称甲方）；

　　　 +

承租方：${hetong.zuke}（以下简称乙方）。　

　 +

租赁房屋地址：${hetong.address}　

　 +

依据《中华人民共和国合同法》有关条款，甲乙双方经过充分协商，就乙方租赁甲方房屋事宜达成如下协议：

+

一、乙方租赁甲方房屋，以下简称租赁房屋。

+

二、起租时间：${hetong.fromdate}，退租时间：${hetong.todate}。 + 在合同签订之日，乙方需向甲方支付房屋租金￥${hetong.price}。如续租，请提前3天通知甲方，并重新办理租赁手续。

　　　　 +

三、违约处理：

　 +

甲方违约：

　 +

1．如甲方未能及时将押金退还乙方，甲方每天应按押金的2％向乙方支付违约金；

+

2．如甲方提供的维修服务项目与协议不相符，乙方有权提前退租，甲方应全额退还剩余的租金。

+

乙方违约：

　　 +

1．如乙方不按时缴纳租金，甲方有权在其押金中扣除，同时收回房屋，所有损失由乙方负责；

　 +

2．如果乙方在租赁期限未满时退租，甲方仅退还剩余租金的40％（租期未满一个月的不在此例）；

　 +

四、本协议书一式两份，甲乙双方各执一份；本协议甲乙双方签字后生效。补充协议亦属于合同的一部分。

　 + 　
　　甲方（盖章）：_________　　　　　　　　乙方（盖章）：_________　　
　 + 　法定代表人（签字）：_________　　　　　法定代表人（签字）：_________　　
　　 + 担保人（签章）：_________　　
　　 + _________年____月____日　　　　　　　　_________年____月____日　　
　　 + 签订地点：_________　　　　　　　　　　签订地点：_________ +
+ + + +
+
+
+ \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/index.jsp b/src/main/webapp/WEB-INF/jsp/admin/index.jsp similarity index 96% rename from WebContent/WEB-INF/jsp/admin/index.jsp rename to src/main/webapp/WEB-INF/jsp/admin/index.jsp index 1dfbcbf..bf398ae 100644 --- a/WebContent/WEB-INF/jsp/admin/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/index.jsp @@ -1,23 +1,23 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - - - - - - - - - - - -
-

首页

-
-
-
-

欢迎来到房屋租赁系统！

-
-
- +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + + + + + + + + + + + +
+

首页

+
+
+
+

欢迎来到房屋租赁系统！

+
+
+ \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/main1.jsp b/src/main/webapp/WEB-INF/jsp/admin/main1.jsp similarity index 80% rename from WebContent/WEB-INF/jsp/admin/main1.jsp rename to src/main/webapp/WEB-INF/jsp/admin/main1.jsp index 207751c..22bb808 100644 --- a/WebContent/WEB-INF/jsp/admin/main1.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/main1.jsp @@ -1,157 +1,157 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - -
-
-
-

后台管理

- -
-
-
    -
  • 欢迎您，${sessionScope.user.username}！
    • - -
  • 退出
    • -
-
-
-
-
-
-
-

菜单

-
-
- -
-
- -
-
-
欢迎使用本系统！
-
- -
- -
-
- -
- - - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + +
+
+
+

后台管理

+ +
+
+
    +
  • 欢迎您，${sessionScope.user.username}！
    • + +
  • 退出
    • +
+
+
+
+
+
+
+

菜单

+
+
+ +
+
+ +
+
+
欢迎使用本系统！
+
+ +
+ +
+
+ +
+ + + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/paid.jsp b/src/main/webapp/WEB-INF/jsp/admin/paid.jsp similarity index 86% rename from WebContent/WEB-INF/jsp/admin/paid.jsp rename to src/main/webapp/WEB-INF/jsp/admin/paid.jsp index acebdde..a528691 100644 --- a/WebContent/WEB-INF/jsp/admin/paid.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/paid.jsp @@ -1,168 +1,168 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - - - - - -
-
-

租客已缴租金列表

-
-
-
-
- - - - - - - - - - - - - -
租客姓名：起始日期:终止日期:
-
-
-
- -
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址租金租金应缴日期租金实缴日期租客姓名状态操作
${paid.house_id }${paid.address}${paid.price}${paid.date}${paid.paydate}${paid.name}${paid.status} - - 删除 -    - - - -
-
- - - - -
- 以上共收入租金：${sum} 元 -
-
- - 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - - -
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + + + + + +
+
+

租客已缴租金列表

+
+
+
+
+ + + + + + + + + + + + + +
租客姓名：起始日期:终止日期:
+
+
+
+ +
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址租金租金应缴日期租金实缴日期租客姓名状态操作
${paid.house_id }${paid.address}${paid.price}${paid.date}${paid.paydate}${paid.name}${paid.status} + + 删除 +    + + + +
+
+ + + + +
+ 以上共收入租金：${sum} 元 +
+
+ + 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/schedule.jsp b/src/main/webapp/WEB-INF/jsp/admin/schedule.jsp similarity index 83% rename from WebContent/WEB-INF/jsp/admin/schedule.jsp rename to src/main/webapp/WEB-INF/jsp/admin/schedule.jsp index 8f6d069..d2aabfd 100644 --- a/WebContent/WEB-INF/jsp/admin/schedule.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/schedule.jsp @@ -1,126 +1,126 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - -
-

日程列表

-
- -
-
-
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
日期日程操作
${schedule.date}${schedule.content} - 修改 -    - - 删除
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + +
+

日程列表

+
+ +
+
+
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
日期日程操作
${schedule.date}${schedule.content} + 修改 +    + + 删除
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/showaddpaid.jsp b/src/main/webapp/WEB-INF/jsp/admin/showaddpaid.jsp similarity index 86% rename from WebContent/WEB-INF/jsp/admin/showaddpaid.jsp rename to src/main/webapp/WEB-INF/jsp/admin/showaddpaid.jsp index 6b2d67d..1c40388 100644 --- a/WebContent/WEB-INF/jsp/admin/showaddpaid.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/showaddpaid.jsp @@ -1,132 +1,132 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - -
-
-

我要收租

-
-
-
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址租金租赁人租赁人身份证号租赁人联系电话操作
${zulist.house_id }${zulist.address}${zulist.price}${zulist.userlist.name}${zulist.userlist.idcard}${zulist.userlist.phone}收租 -    - - - - -
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + +
+
+

我要收租

+
+
+
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址租金租赁人租赁人身份证号租赁人联系电话操作
${zulist.house_id }${zulist.address}${zulist.price}${zulist.userlist.name}${zulist.userlist.idcard}${zulist.userlist.phone}收租 +    + + + + +
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/solve.jsp b/src/main/webapp/WEB-INF/jsp/admin/solve.jsp similarity index 86% rename from WebContent/WEB-INF/jsp/admin/solve.jsp rename to src/main/webapp/WEB-INF/jsp/admin/solve.jsp index 76de654..6240419 100644 --- a/WebContent/WEB-INF/jsp/admin/solve.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/solve.jsp @@ -1,165 +1,165 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - - - - - -
-
-

已处理报障列表

-
-
-
-
- - - - - - - - - - - - - -
租客姓名：起始日期:终止日期:
-
-
-
- -
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址报障日期租赁人报障内容状态操作
${solve.house_id }${solve.address}${solve.date}${solve.name}${solve.detail}${solve.status} - - 删除 -    - - - -
-
- - - - -
- 以上报障：${count} 条 -
-
- - 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - - -
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + + + + + +
+
+

已处理报障列表

+
+
+
+
+ + + + + + + + + + + + + +
租客姓名：起始日期:终止日期:
+
+
+
+ +
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址报障日期租赁人报障内容状态操作
${solve.house_id }${solve.address}${solve.date}${solve.name}${solve.detail}${solve.status} + + 删除 +    + + + +
+
+ + + + +
+ 以上报障：${count} 条 +
+
+ + 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/topaid.jsp b/src/main/webapp/WEB-INF/jsp/admin/topaid.jsp similarity index 82% rename from WebContent/WEB-INF/jsp/admin/topaid.jsp rename to src/main/webapp/WEB-INF/jsp/admin/topaid.jsp index 90bd0a0..19ddbb1 100644 --- a/WebContent/WEB-INF/jsp/admin/topaid.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/topaid.jsp @@ -1,141 +1,141 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - - - - - -
-
-

租客未缴列表

-
-
- - - - -
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址应缴租金租金应缴日期租客姓名状态
${topaid.house_id }${topaid.address}${topaid.price}${topaid.date}${topaid.name}${topaid.status}
-
- - - - - -
- - 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - -
- -
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + + + + + +
+
+

租客未缴列表

+
+
+ + + + +
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址应缴租金租金应缴日期租客姓名状态
${topaid.house_id }${topaid.address}${topaid.price}${topaid.date}${topaid.name}${topaid.status}
+
+ + + + + +
+ + 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + +
+ +
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/updatehetong.jsp b/src/main/webapp/WEB-INF/jsp/admin/updatehetong.jsp similarity index 91% rename from WebContent/WEB-INF/jsp/admin/updatehetong.jsp rename to src/main/webapp/WEB-INF/jsp/admin/updatehetong.jsp index 24bae06..98e50f8 100644 --- a/WebContent/WEB-INF/jsp/admin/updatehetong.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/updatehetong.jsp @@ -1,205 +1,205 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - - - - - - - 房屋租赁系统 - - - - - - - - - - - - - -
-

修改合同信息，请确定合同信息正确无误再提交！

-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${error } - -
*房屋id： - -
*地址：
*出租方（甲方）：
*出租方（甲方）证件号码：
*承租方（乙方）：
*承租方（乙方）证件号码：
*起租时间：
*退租时间：
*每月租金：
*每月交租日（数字）：
- - -
-
-
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + + + + 房屋租赁系统 + + + + + + + + + + + + + +
+

修改合同信息，请确定合同信息正确无误再提交！

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${error } + +
*房屋id： + +
*地址：
*出租方（甲方）：
*出租方（甲方）证件号码：
*承租方（乙方）：
*承租方（乙方）证件号码：
*起租时间：
*退租时间：
*每月租金：
*每月交租日（数字）：
+ + +
+
+
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/updateschedule.jsp b/src/main/webapp/WEB-INF/jsp/admin/updateschedule.jsp similarity index 83% rename from WebContent/WEB-INF/jsp/admin/updateschedule.jsp rename to src/main/webapp/WEB-INF/jsp/admin/updateschedule.jsp index 28a3e94..25844d8 100644 --- a/WebContent/WEB-INF/jsp/admin/updateschedule.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/updateschedule.jsp @@ -1,102 +1,102 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - - - - - - - 房屋租赁系统 - - - - - - - - - - - - - -
-

编辑日程

-
-
-
-
- - - - - - - - - - - - - - - - - - ${error } - -
*日期： - -
*日程：
- - -
-
-
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + + + + 房屋租赁系统 + + + + + + + + + + + + + +
+

编辑日程

+
+
+
+
+ + + + + + + + + + + + + + + + + + ${error } + +
*日期： + +
*日程：
+ + +
+
+
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/userlist.jsp b/src/main/webapp/WEB-INF/jsp/admin/userlist.jsp similarity index 86% rename from WebContent/WEB-INF/jsp/admin/userlist.jsp rename to src/main/webapp/WEB-INF/jsp/admin/userlist.jsp index 9205632..a5ea17e 100644 --- a/WebContent/WEB-INF/jsp/admin/userlist.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/userlist.jsp @@ -1,134 +1,134 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - -
-
-

用户列表

-
-
-
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
租客用户名租客姓名租客身份证号码租客联系电话操作
${userlist.user.username}${userlist.name}${userlist.idcard}${userlist.phone} - - 删除 - - - -
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + +
+
+

用户列表

+
+
+
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
租客用户名租客姓名租客身份证号码租客联系电话操作
${userlist.user.username}${userlist.name}${userlist.idcard}${userlist.phone} + + 删除 + + + +
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/wrong.jsp b/src/main/webapp/WEB-INF/jsp/admin/wrong.jsp similarity index 86% rename from WebContent/WEB-INF/jsp/admin/wrong.jsp rename to src/main/webapp/WEB-INF/jsp/admin/wrong.jsp index 481a540..8eb68c1 100644 --- a/WebContent/WEB-INF/jsp/admin/wrong.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/wrong.jsp @@ -1,134 +1,134 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - -
-
-

待处理报障

-
-
-
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址报障日期租赁人报障内容状态操作
${wrong.house_id }${wrong.address}${wrong.date}${wrong.name}${wrong.detail}${wrong.status}已处理 -    - - - - -
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + +
+
+

待处理报障

+
+
+
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址报障日期租赁人报障内容状态操作
${wrong.house_id }${wrong.address}${wrong.date}${wrong.name}${wrong.detail}${wrong.status}已处理 +    + + + + +
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/admin/zulist.jsp b/src/main/webapp/WEB-INF/jsp/admin/zulist.jsp similarity index 85% rename from WebContent/WEB-INF/jsp/admin/zulist.jsp rename to src/main/webapp/WEB-INF/jsp/admin/zulist.jsp index a00f5bb..db4835a 100644 --- a/WebContent/WEB-INF/jsp/admin/zulist.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/zulist.jsp @@ -1,136 +1,136 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - -
-
-

在租列表

-
-
-
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址价格租赁人租赁人身份证号租赁人联系电话操作
${zulist.house_id }${zulist.address}${zulist.price}${zulist.userlist.name}${zulist.userlist.idcard}${zulist.userlist.phone}查看合同 -    - - 终止合同
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + +
+
+

在租列表

+
+
+
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址价格租赁人租赁人身份证号租赁人联系电话操作
${zulist.house_id }${zulist.address}${zulist.price}${zulist.userlist.name}${zulist.userlist.idcard}${zulist.userlist.phone}查看合同 +    + + 终止合同
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp similarity index 87% rename from WebContent/WEB-INF/jsp/login.jsp rename to src/main/webapp/WEB-INF/jsp/login.jsp index 03ee9c6..9e950a3 100644 --- a/WebContent/WEB-INF/jsp/login.jsp +++ b/src/main/webapp/WEB-INF/jsp/login.jsp @@ -1,108 +1,108 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - - <% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - -房屋租赁系统 - - - -
- -
-

房屋租赁系统

-
-
-
-
- - -
- - -
-
- -
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
- -
- - - - - - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + + <% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + +房屋租赁系统 + + + +
+ +
+

房屋租赁系统

+
+
+
+
+ + +
+ + +
+
+ +
    +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
+ +
+ + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/userlist.jsp b/src/main/webapp/WEB-INF/jsp/userlist.jsp similarity index 97% rename from WebContent/WEB-INF/jsp/userlist.jsp rename to src/main/webapp/WEB-INF/jsp/userlist.jsp index 9564556..5fdf520 100644 --- a/WebContent/WEB-INF/jsp/userlist.jsp +++ b/src/main/webapp/WEB-INF/jsp/userlist.jsp @@ -1,18 +1,18 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - -Insert title here - - - - - - - -
id名字密码类型
${user.id}${user.username}${user.password}${user.type}
- +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + +Insert title here + + + + + + + +
id名字密码类型
${user.id}${user.username}${user.password}${user.type}
+ \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/zuke/addwrong.jsp b/src/main/webapp/WEB-INF/jsp/zuke/addwrong.jsp similarity index 86% rename from WebContent/WEB-INF/jsp/zuke/addwrong.jsp rename to src/main/webapp/WEB-INF/jsp/zuke/addwrong.jsp index ca2b24e..7f88549 100644 --- a/WebContent/WEB-INF/jsp/zuke/addwrong.jsp +++ b/src/main/webapp/WEB-INF/jsp/zuke/addwrong.jsp @@ -1,110 +1,110 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - - - - - - - 房屋租赁系统 - - - - - - - - - - - - - -
-

添加报障信息

-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - ${error } - -
*房屋id： - -
*地址：
*租客姓名：
*报障日期：
*报障内容：
- - -
-
-
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + + + + 房屋租赁系统 + + + + + + + + + + + + + +
+

添加报障信息

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + ${error } + +
*房屋id： + +
*地址：
*租客姓名：
*报障日期：
*报障内容：
+ + +
+
+
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/zuke/houselist.jsp b/src/main/webapp/WEB-INF/jsp/zuke/houselist.jsp similarity index 90% rename from WebContent/WEB-INF/jsp/zuke/houselist.jsp rename to src/main/webapp/WEB-INF/jsp/zuke/houselist.jsp index 34cb6c0..a012e07 100644 --- a/WebContent/WEB-INF/jsp/zuke/houselist.jsp +++ b/src/main/webapp/WEB-INF/jsp/zuke/houselist.jsp @@ -1,145 +1,145 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - -
-
-

房源列表

-
-
-
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址面积价格状态操作
${houselist.houseid }${houselist.address}${houselist.area}${houselist.price}${houselist.status} - - - 申请看房 -    - - - 该房已被租赁 -    - - - 该房已被申请 - - - - -
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + +
+
+

房源列表

+
+
+
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址面积价格状态操作
${houselist.houseid }${houselist.address}${houselist.area}${houselist.price}${houselist.status} + + + 申请看房 +    + + + 该房已被租赁 +    + + + 该房已被申请 + + + + +
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/zuke/main.jsp b/src/main/webapp/WEB-INF/jsp/zuke/main.jsp similarity index 81% rename from WebContent/WEB-INF/jsp/zuke/main.jsp rename to src/main/webapp/WEB-INF/jsp/zuke/main.jsp index 55072d7..331c52d 100644 --- a/WebContent/WEB-INF/jsp/zuke/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/zuke/main.jsp @@ -1,143 +1,143 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - -
-
-
-

后台管理

- -
-
-
    -
  • 欢迎您，${sessionScope.user.username}！
    • - -
  • 退出
    • -
-
-
-
-
-
-
-

菜单

-
-
- -
-
- -
-
-
欢迎使用本系统！
-
- -
- -
-
- -
- - - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + +
+
+
+

后台管理

+ +
+
+
    +
  • 欢迎您，${sessionScope.user.username}！
    • + +
  • 退出
    • +
+
+
+
+
+
+
+

菜单

+
+
+ +
+
+ +
+
+
欢迎使用本系统！
+
+ +
+ +
+
+ +
+ + + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/zuke/myapply.jsp b/src/main/webapp/WEB-INF/jsp/zuke/myapply.jsp similarity index 87% rename from WebContent/WEB-INF/jsp/zuke/myapply.jsp rename to src/main/webapp/WEB-INF/jsp/zuke/myapply.jsp index 1f3c2e5..48414db 100644 --- a/WebContent/WEB-INF/jsp/zuke/myapply.jsp +++ b/src/main/webapp/WEB-INF/jsp/zuke/myapply.jsp @@ -1,124 +1,124 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - -房屋租赁系统 - - - - - - - - - -
-
-

看房申请列表

-
-
-
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
申请人申请人身份证号申请人联系电话房屋id地址价格状态
${userlist.name }${userlist.idcard}${userlist.phone}${apply.house_id}${apply.address}${apply.price}${apply.status}
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 , - - - [前一页] - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + +房屋租赁系统 + + + + + + + + + +
+
+

看房申请列表

+
+
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
申请人申请人身份证号申请人联系电话房屋id地址价格状态
${userlist.name }${userlist.idcard}${userlist.phone}${apply.house_id}${apply.address}${apply.price}${apply.status}
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 , + + + [前一页] + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/zuke/myapplyout.jsp b/src/main/webapp/WEB-INF/jsp/zuke/myapplyout.jsp similarity index 85% rename from WebContent/WEB-INF/jsp/zuke/myapplyout.jsp rename to src/main/webapp/WEB-INF/jsp/zuke/myapplyout.jsp index 1d49127..cc6894f 100644 --- a/WebContent/WEB-INF/jsp/zuke/myapplyout.jsp +++ b/src/main/webapp/WEB-INF/jsp/zuke/myapplyout.jsp @@ -1,133 +1,133 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - -房屋租赁系统 - - - - - - - - - -
-
-

退租申请列表

-
-
-
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
申请人申请人身份证号申请人联系电话房屋id地址状态操作
${userlist.name }${userlist.idcard}${userlist.phone}${applyout.house_id}${applyout.address}${applyout.status} - - 删除 -    - -
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 , - - - [前一页] - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + +房屋租赁系统 + + + + + + + + + +
+
+

退租申请列表

+
+
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
申请人申请人身份证号申请人联系电话房屋id地址状态操作
${userlist.name }${userlist.idcard}${userlist.phone}${applyout.house_id}${applyout.address}${applyout.status} + + 删除 +    + +
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 , + + + [前一页] + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/zuke/mycheckout.jsp b/src/main/webapp/WEB-INF/jsp/zuke/mycheckout.jsp similarity index 87% rename from WebContent/WEB-INF/jsp/zuke/mycheckout.jsp rename to src/main/webapp/WEB-INF/jsp/zuke/mycheckout.jsp index 6335fd4..3fa3aff 100644 --- a/WebContent/WEB-INF/jsp/zuke/mycheckout.jsp +++ b/src/main/webapp/WEB-INF/jsp/zuke/mycheckout.jsp @@ -1,136 +1,136 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - -
-
-

已退租列表

-
-
-
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
退租人退租人身份证号退租人联系电话房屋id地址状态操作
${userlist.name }${userlist.idcard}${userlist.phone}${checkout.house_id}${checkout.address}${checkout.status} - - 删除
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + +
+
+

已退租列表

+
+
+
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
退租人退租人身份证号退租人联系电话房屋id地址状态操作
${userlist.name }${userlist.idcard}${userlist.phone}${checkout.house_id}${checkout.address}${checkout.status} + + 删除
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/zuke/mypaid.jsp b/src/main/webapp/WEB-INF/jsp/zuke/mypaid.jsp similarity index 86% rename from WebContent/WEB-INF/jsp/zuke/mypaid.jsp rename to src/main/webapp/WEB-INF/jsp/zuke/mypaid.jsp index da2140e..560da8c 100644 --- a/WebContent/WEB-INF/jsp/zuke/mypaid.jsp +++ b/src/main/webapp/WEB-INF/jsp/zuke/mypaid.jsp @@ -1,171 +1,171 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - - - - - -
-
-

已缴租金列表

-
-
-
-
- - - - - - - - - - - - -
起始日期:终止日期:
-
-
-
- -
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址租金租金应缴日期租金实缴日期租客姓名状态操作
${paid.house_id }${paid.address}${paid.price}${paid.date}${paid.paydate}${paid.name}${paid.status} - - 删除 -    - - - -
-
- - - - -
- 以上共缴租金：${sum} 元 -
-
- - 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - - -
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + + + + + +
+
+

已缴租金列表

+
+
+
+
+ + + + + + + + + + + + +
起始日期:终止日期:
+
+
+
+ +
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址租金租金应缴日期租金实缴日期租客姓名状态操作
${paid.house_id }${paid.address}${paid.price}${paid.date}${paid.paydate}${paid.name}${paid.status} + + 删除 +    + + + +
+
+ + + + +
+ 以上共缴租金：${sum} 元 +
+
+ + 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/zuke/mysolve.jsp b/src/main/webapp/WEB-INF/jsp/zuke/mysolve.jsp similarity index 85% rename from WebContent/WEB-INF/jsp/zuke/mysolve.jsp rename to src/main/webapp/WEB-INF/jsp/zuke/mysolve.jsp index 84ae211..c04eea9 100644 --- a/WebContent/WEB-INF/jsp/zuke/mysolve.jsp +++ b/src/main/webapp/WEB-INF/jsp/zuke/mysolve.jsp @@ -1,164 +1,164 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - - - - - -
-
-

已处理报障列表

-
-
-
-
- - - - - - - - - - - - -
起始日期:终止日期:
-
-
-
- -
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址报障日期租赁人报障内容状态操作
${solve.house_id }${solve.address}${solve.date}${solve.name}${solve.detail}${solve.status} - - 删除 -    - - - -
-
- - - - -
- 以上报障：${count} 条 -
-
- - 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - - -
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + + + + + +
+
+

已处理报障列表

+
+
+
+
+ + + + + + + + + + + + +
起始日期:终止日期:
+
+
+
+ +
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址报障日期租赁人报障内容状态操作
${solve.house_id }${solve.address}${solve.date}${solve.name}${solve.detail}${solve.status} + + 删除 +    + + + +
+
+ + + + +
+ 以上报障：${count} 条 +
+
+ + 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/zuke/mytopaid.jsp b/src/main/webapp/WEB-INF/jsp/zuke/mytopaid.jsp similarity index 82% rename from WebContent/WEB-INF/jsp/zuke/mytopaid.jsp rename to src/main/webapp/WEB-INF/jsp/zuke/mytopaid.jsp index 88498af..037c166 100644 --- a/WebContent/WEB-INF/jsp/zuke/mytopaid.jsp +++ b/src/main/webapp/WEB-INF/jsp/zuke/mytopaid.jsp @@ -1,144 +1,144 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - - - - - -
-
-

待缴租金列表

-
-
- - - - -
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址应缴租金租金应缴日期租客姓名状态操作
${topaid.house_id }${topaid.address}${topaid.price}${topaid.date}${topaid.name}${topaid.status}支付租金 -   
-
- - - - - -
- - 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - -
- -
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + + + + + +
+
+

待缴租金列表

+
+
+ + + + +
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址应缴租金租金应缴日期租客姓名状态操作
${topaid.house_id }${topaid.address}${topaid.price}${topaid.date}${topaid.name}${topaid.status}支付租金 +   
+
+ + + + + +
+ + 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + +
+ +
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/zuke/mywrong.jsp b/src/main/webapp/WEB-INF/jsp/zuke/mywrong.jsp similarity index 87% rename from WebContent/WEB-INF/jsp/zuke/mywrong.jsp rename to src/main/webapp/WEB-INF/jsp/zuke/mywrong.jsp index 0ac3881..5745d17 100644 --- a/WebContent/WEB-INF/jsp/zuke/mywrong.jsp +++ b/src/main/webapp/WEB-INF/jsp/zuke/mywrong.jsp @@ -1,125 +1,125 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - -
-
-

待处理报障

-
-
-
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址报障日期租赁人报障内容状态
${wrong.house_id }${wrong.address}${wrong.date}${wrong.name}${wrong.detail}${wrong.status}
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + +
+
+

待处理报障

+
+
+
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址报障日期租赁人报障内容状态
${wrong.house_id }${wrong.address}${wrong.date}${wrong.name}${wrong.detail}${wrong.status}
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/zuke/myzulist.jsp b/src/main/webapp/WEB-INF/jsp/zuke/myzulist.jsp similarity index 84% rename from WebContent/WEB-INF/jsp/zuke/myzulist.jsp rename to src/main/webapp/WEB-INF/jsp/zuke/myzulist.jsp index c2d1adb..9feb646 100644 --- a/WebContent/WEB-INF/jsp/zuke/myzulist.jsp +++ b/src/main/webapp/WEB-INF/jsp/zuke/myzulist.jsp @@ -1,128 +1,128 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - -房屋租赁系统 - - - - - - - - - -
-
-

我的租赁

-
-
-
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
租赁人租赁人身份证号租赁人联系电话房屋id地址价格操作
${userlist.name }${userlist.idcard}${userlist.phone}${zulist.house_id}${zulist.address}${zulist.price}查看合同 -    申请退租
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 , - - - [前一页] - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + +房屋租赁系统 + + + + + + + + + +
+
+

我的租赁

+
+
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
租赁人租赁人身份证号租赁人联系电话房屋id地址价格操作
${userlist.name }${userlist.idcard}${userlist.phone}${zulist.house_id}${zulist.address}${zulist.price}查看合同 +    申请退租
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 , + + + [前一页] + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/zuke/showaddwrong.jsp b/src/main/webapp/WEB-INF/jsp/zuke/showaddwrong.jsp similarity index 86% rename from WebContent/WEB-INF/jsp/zuke/showaddwrong.jsp rename to src/main/webapp/WEB-INF/jsp/zuke/showaddwrong.jsp index 99028f7..925bbd1 100644 --- a/WebContent/WEB-INF/jsp/zuke/showaddwrong.jsp +++ b/src/main/webapp/WEB-INF/jsp/zuke/showaddwrong.jsp @@ -1,132 +1,132 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() - + path + "/"; -%> - - - - - 房屋租赁系统 - - - - - - - - - -
-
-

我要报障

-
-
-
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
房屋id地址租金租赁人租赁人身份证号租赁人联系电话操作
${zulist.house_id }${zulist.address}${zulist.price}${zulist.userlist.name}${zulist.userlist.idcard}${zulist.userlist.phone}报障 -    - - - - -
-
- - - - - -
- 共[${p.total}]条记录，共[${p.pages}]页 - , - - - [前一页] - - - 第${p.pageNum}页 - - - [后一页] - - - -
- - - - - - - - - - - -
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + 房屋租赁系统 + + + + + + + + + +
+
+

我要报障

+
+
+
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
房屋id地址租金租赁人租赁人身份证号租赁人联系电话操作
${zulist.house_id }${zulist.address}${zulist.price}${zulist.userlist.name}${zulist.userlist.idcard}${zulist.userlist.phone}报障 +    + + + + +
+
+ + + + + +
+ 共[${p.total}]条记录，共[${p.pages}]页 + , + + + [前一页] + + + 第${p.pageNum}页 + + + [后一页] + + + +
+ + + + + + + + + + + +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/zuke/showhetong.jsp b/src/main/webapp/WEB-INF/jsp/zuke/showhetong.jsp similarity index 84% rename from WebContent/WEB-INF/jsp/zuke/showhetong.jsp rename to src/main/webapp/WEB-INF/jsp/zuke/showhetong.jsp index e9f355e..21dfc88 100644 --- a/WebContent/WEB-INF/jsp/zuke/showhetong.jsp +++ b/src/main/webapp/WEB-INF/jsp/zuke/showhetong.jsp @@ -1,66 +1,66 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - - - - -Insert title here - - - - - - - - - - - -

-
-
房屋租赁合同
- -

出租方：${hetong.chuzu}（以下简称甲方）；

　　　 -

承租方：${hetong.zuke}（以下简称乙方）。　

　 -

租赁房屋地址：${hetong.address}　

　 -

依据《中华人民共和国合同法》有关条款，甲乙双方经过充分协商，就乙方租赁甲方房屋事宜达成如下协议：

-

一、乙方租赁甲方房屋，以下简称租赁房屋。

-

二、起租时间：${hetong.fromdate}，退租时间：${hetong.todate}。 - 在合同签订之日，乙方需向甲方支付房屋租金￥${hetong.price}。如续租，请提前3天通知甲方，并重新办理租赁手续。

　　　　 -

三、违约处理：

　 -

甲方违约：

　 -

1．如甲方未能及时将押金退还乙方，甲方每天应按押金的2％向乙方支付违约金；

-

2．如甲方提供的维修服务项目与协议不相符，乙方有权提前退租，甲方应全额退还剩余的租金。

-

乙方违约：

　　 -

1．如乙方不按时缴纳租金，甲方有权在其押金中扣除，同时收回房屋，所有损失由乙方负责；

　 -

2．如果乙方在租赁期限未满时退租，甲方仅退还剩余租金的40％（租期未满一个月的不在此例）；

　 -

四、本协议书一式两份，甲乙双方各执一份；本协议甲乙双方签字后生效。补充协议亦属于合同的一部分。

　 - 　
　　甲方（盖章）：_________　　　　　　　　乙方（盖章）：_________　　
　 - 　法定代表人（签字）：_________　　　　　法定代表人（签字）：_________　　
　　 - 担保人（签章）：_________　　
　　 - _________年____月____日　　　　　　　　_________年____月____日　　
　　 - 签订地点：_________　　　　　　　　　　签订地点：_________ -
- - - -
-
-
- +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + + + + +Insert title here + + + + + + + + + + + +

+
+
房屋租赁合同
+ +

出租方：${hetong.chuzu}（以下简称甲方）；

　　　 +

承租方：${hetong.zuke}（以下简称乙方）。　

　 +

租赁房屋地址：${hetong.address}　

　 +

依据《中华人民共和国合同法》有关条款，甲乙双方经过充分协商，就乙方租赁甲方房屋事宜达成如下协议：

+

一、乙方租赁甲方房屋，以下简称租赁房屋。

+

二、起租时间：${hetong.fromdate}，退租时间：${hetong.todate}。 + 在合同签订之日，乙方需向甲方支付房屋租金￥${hetong.price}。如续租，请提前3天通知甲方，并重新办理租赁手续。

　　　　 +

三、违约处理：

　 +

甲方违约：

　 +

1．如甲方未能及时将押金退还乙方，甲方每天应按押金的2％向乙方支付违约金；

+

2．如甲方提供的维修服务项目与协议不相符，乙方有权提前退租，甲方应全额退还剩余的租金。

+

乙方违约：

　　 +

1．如乙方不按时缴纳租金，甲方有权在其押金中扣除，同时收回房屋，所有损失由乙方负责；

　 +

2．如果乙方在租赁期限未满时退租，甲方仅退还剩余租金的40％（租期未满一个月的不在此例）；

　 +

四、本协议书一式两份，甲乙双方各执一份；本协议甲乙双方签字后生效。补充协议亦属于合同的一部分。

　 + 　
　　甲方（盖章）：_________　　　　　　　　乙方（盖章）：_________　　
　 + 　法定代表人（签字）：_________　　　　　法定代表人（签字）：_________　　
　　 + 担保人（签章）：_________　　
　　 + _________年____月____日　　　　　　　　_________年____月____日　　
　　 + 签订地点：_________　　　　　　　　　　签订地点：_________ +
+ + + +
+
+
+ \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/zuke/updateuserlist.jsp b/src/main/webapp/WEB-INF/jsp/zuke/updateuserlist.jsp similarity index 89% rename from WebContent/WEB-INF/jsp/zuke/updateuserlist.jsp rename to src/main/webapp/WEB-INF/jsp/zuke/updateuserlist.jsp index 75f26fa..f951656 100644 --- a/WebContent/WEB-INF/jsp/zuke/updateuserlist.jsp +++ b/src/main/webapp/WEB-INF/jsp/zuke/updateuserlist.jsp @@ -1,113 +1,113 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - - - - - - - 房屋租赁系统 - - - - - - - - - - - - -
-

完善个人资料

-
-
-
-
- - - - - - - - - - - - - - - - - - - - - ${error } - -
*姓名： - -
*身份证号码：
*手机号码：
- - -
-
-
-
- - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + + + + + 房屋租赁系统 + + + + + + + + + + + + +
+

完善个人资料

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + ${error } + +
*姓名： + +
*身份证号码：
*手机号码：
+ + +
+
+
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/lib/aopalliance-1.0.jar b/src/main/webapp/WEB-INF/lib/aopalliance-1.0.jar similarity index 100% rename from WebContent/WEB-INF/lib/aopalliance-1.0.jar rename to src/main/webapp/WEB-INF/lib/aopalliance-1.0.jar diff --git a/WebContent/WEB-INF/lib/asm-3.3.1.jar b/src/main/webapp/WEB-INF/lib/asm-3.3.1.jar similarity index 100% rename from WebContent/WEB-INF/lib/asm-3.3.1.jar rename to src/main/webapp/WEB-INF/lib/asm-3.3.1.jar diff --git a/WebContent/WEB-INF/lib/aspectjweaver-1.6.11.jar b/src/main/webapp/WEB-INF/lib/aspectjweaver-1.6.11.jar similarity index 100% rename from WebContent/WEB-INF/lib/aspectjweaver-1.6.11.jar rename to src/main/webapp/WEB-INF/lib/aspectjweaver-1.6.11.jar diff --git a/WebContent/WEB-INF/lib/cglib-2.2.2.jar b/src/main/webapp/WEB-INF/lib/cglib-2.2.2.jar similarity index 100% rename from WebContent/WEB-INF/lib/cglib-2.2.2.jar rename to src/main/webapp/WEB-INF/lib/cglib-2.2.2.jar diff --git a/WebContent/WEB-INF/lib/commons-dbcp-1.2.2.jar b/src/main/webapp/WEB-INF/lib/commons-dbcp-1.2.2.jar similarity index 100% rename from WebContent/WEB-INF/lib/commons-dbcp-1.2.2.jar rename to src/main/webapp/WEB-INF/lib/commons-dbcp-1.2.2.jar diff --git a/WebContent/WEB-INF/lib/commons-fileupload-1.2.2.jar b/src/main/webapp/WEB-INF/lib/commons-fileupload-1.2.2.jar similarity index 100% rename from WebContent/WEB-INF/lib/commons-fileupload-1.2.2.jar rename to src/main/webapp/WEB-INF/lib/commons-fileupload-1.2.2.jar diff --git a/WebContent/WEB-INF/lib/commons-io-2.4.jar b/src/main/webapp/WEB-INF/lib/commons-io-2.4.jar similarity index 100% rename from WebContent/WEB-INF/lib/commons-io-2.4.jar rename to src/main/webapp/WEB-INF/lib/commons-io-2.4.jar diff --git a/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar b/src/main/webapp/WEB-INF/lib/commons-logging-1.1.1.jar similarity index 100% rename from WebContent/WEB-INF/lib/commons-logging-1.1.1.jar rename to src/main/webapp/WEB-INF/lib/commons-logging-1.1.1.jar diff --git a/WebContent/WEB-INF/lib/commons-pool-1.3.jar b/src/main/webapp/WEB-INF/lib/commons-pool-1.3.jar similarity index 100% rename from WebContent/WEB-INF/lib/commons-pool-1.3.jar rename to src/main/webapp/WEB-INF/lib/commons-pool-1.3.jar diff --git a/WebContent/WEB-INF/lib/jackson-core-2.4.2.jar b/src/main/webapp/WEB-INF/lib/jackson-core-2.4.2.jar similarity index 100% rename from WebContent/WEB-INF/lib/jackson-core-2.4.2.jar rename to src/main/webapp/WEB-INF/lib/jackson-core-2.4.2.jar diff --git a/WebContent/WEB-INF/lib/jackson-databind-2.4.2.jar b/src/main/webapp/WEB-INF/lib/jackson-databind-2.4.2.jar similarity index 100% rename from WebContent/WEB-INF/lib/jackson-databind-2.4.2.jar rename to src/main/webapp/WEB-INF/lib/jackson-databind-2.4.2.jar diff --git a/WebContent/WEB-INF/lib/javassist-3.17.1-GA.jar b/src/main/webapp/WEB-INF/lib/javassist-3.17.1-GA.jar similarity index 100% rename from WebContent/WEB-INF/lib/javassist-3.17.1-GA.jar rename to src/main/webapp/WEB-INF/lib/javassist-3.17.1-GA.jar diff --git a/WebContent/WEB-INF/lib/jsqlparser-0.9.1.jar b/src/main/webapp/WEB-INF/lib/jsqlparser-0.9.1.jar similarity index 100% rename from WebContent/WEB-INF/lib/jsqlparser-0.9.1.jar rename to src/main/webapp/WEB-INF/lib/jsqlparser-0.9.1.jar diff --git a/WebContent/WEB-INF/lib/jstl-1.2.jar b/src/main/webapp/WEB-INF/lib/jstl-1.2.jar similarity index 100% rename from WebContent/WEB-INF/lib/jstl-1.2.jar rename to src/main/webapp/WEB-INF/lib/jstl-1.2.jar diff --git a/WebContent/WEB-INF/lib/junit-4.9.jar b/src/main/webapp/WEB-INF/lib/junit-4.9.jar similarity index 100% rename from WebContent/WEB-INF/lib/junit-4.9.jar rename to src/main/webapp/WEB-INF/lib/junit-4.9.jar diff --git a/WebContent/WEB-INF/lib/log4j-1.2.17.jar b/src/main/webapp/WEB-INF/lib/log4j-1.2.17.jar similarity index 100% rename from WebContent/WEB-INF/lib/log4j-1.2.17.jar rename to src/main/webapp/WEB-INF/lib/log4j-1.2.17.jar diff --git a/WebContent/WEB-INF/lib/log4j-api-2.0-rc1.jar b/src/main/webapp/WEB-INF/lib/log4j-api-2.0-rc1.jar similarity index 100% rename from WebContent/WEB-INF/lib/log4j-api-2.0-rc1.jar rename to src/main/webapp/WEB-INF/lib/log4j-api-2.0-rc1.jar diff --git a/WebContent/WEB-INF/lib/log4j-core-2.0-rc1.jar b/src/main/webapp/WEB-INF/lib/log4j-core-2.0-rc1.jar similarity index 100% rename from WebContent/WEB-INF/lib/log4j-core-2.0-rc1.jar rename to src/main/webapp/WEB-INF/lib/log4j-core-2.0-rc1.jar diff --git a/WebContent/WEB-INF/lib/mybatis-3.2.7.jar b/src/main/webapp/WEB-INF/lib/mybatis-3.2.7.jar similarity index 100% rename from WebContent/WEB-INF/lib/mybatis-3.2.7.jar rename to src/main/webapp/WEB-INF/lib/mybatis-3.2.7.jar diff --git a/WebContent/WEB-INF/lib/mybatis-spring-1.2.2.jar b/src/main/webapp/WEB-INF/lib/mybatis-spring-1.2.2.jar similarity index 100% rename from WebContent/WEB-INF/lib/mybatis-spring-1.2.2.jar rename to src/main/webapp/WEB-INF/lib/mybatis-spring-1.2.2.jar diff --git a/WebContent/WEB-INF/lib/mysql-connector-java-5.1.7-bin.jar b/src/main/webapp/WEB-INF/lib/mysql-connector-java-5.1.7-bin.jar similarity index 100% rename from WebContent/WEB-INF/lib/mysql-connector-java-5.1.7-bin.jar rename to src/main/webapp/WEB-INF/lib/mysql-connector-java-5.1.7-bin.jar diff --git a/WebContent/WEB-INF/lib/pageTag.jar b/src/main/webapp/WEB-INF/lib/pageTag.jar similarity index 100% rename from WebContent/WEB-INF/lib/pageTag.jar rename to src/main/webapp/WEB-INF/lib/pageTag.jar diff --git a/WebContent/WEB-INF/lib/pagehelper-3.4.2-fix.jar b/src/main/webapp/WEB-INF/lib/pagehelper-3.4.2-fix.jar similarity index 100% rename from WebContent/WEB-INF/lib/pagehelper-3.4.2-fix.jar rename to src/main/webapp/WEB-INF/lib/pagehelper-3.4.2-fix.jar diff --git a/WebContent/WEB-INF/lib/slf4j-api-1.7.5.jar b/src/main/webapp/WEB-INF/lib/slf4j-api-1.7.5.jar similarity index 100% rename from WebContent/WEB-INF/lib/slf4j-api-1.7.5.jar rename to src/main/webapp/WEB-INF/lib/slf4j-api-1.7.5.jar diff --git a/WebContent/WEB-INF/lib/slf4j-log4j12-1.7.5.jar b/src/main/webapp/WEB-INF/lib/slf4j-log4j12-1.7.5.jar similarity index 100% rename from WebContent/WEB-INF/lib/slf4j-log4j12-1.7.5.jar rename to src/main/webapp/WEB-INF/lib/slf4j-log4j12-1.7.5.jar diff --git a/WebContent/WEB-INF/lib/spring-aop-4.1.3.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-aop-4.1.3.RELEASE.jar similarity index 100% rename from WebContent/WEB-INF/lib/spring-aop-4.1.3.RELEASE.jar rename to src/main/webapp/WEB-INF/lib/spring-aop-4.1.3.RELEASE.jar diff --git a/WebContent/WEB-INF/lib/spring-aspects-4.1.3.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-aspects-4.1.3.RELEASE.jar similarity index 100% rename from WebContent/WEB-INF/lib/spring-aspects-4.1.3.RELEASE.jar rename to src/main/webapp/WEB-INF/lib/spring-aspects-4.1.3.RELEASE.jar diff --git a/WebContent/WEB-INF/lib/spring-beans-4.1.3.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-beans-4.1.3.RELEASE.jar similarity index 100% rename from WebContent/WEB-INF/lib/spring-beans-4.1.3.RELEASE.jar rename to src/main/webapp/WEB-INF/lib/spring-beans-4.1.3.RELEASE.jar diff --git a/WebContent/WEB-INF/lib/spring-context-4.1.3.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-context-4.1.3.RELEASE.jar similarity index 100% rename from WebContent/WEB-INF/lib/spring-context-4.1.3.RELEASE.jar rename to src/main/webapp/WEB-INF/lib/spring-context-4.1.3.RELEASE.jar diff --git a/WebContent/WEB-INF/lib/spring-context-support-4.1.3.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-context-support-4.1.3.RELEASE.jar similarity index 100% rename from WebContent/WEB-INF/lib/spring-context-support-4.1.3.RELEASE.jar rename to src/main/webapp/WEB-INF/lib/spring-context-support-4.1.3.RELEASE.jar diff --git a/WebContent/WEB-INF/lib/spring-core-4.1.3.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-core-4.1.3.RELEASE.jar similarity index 100% rename from WebContent/WEB-INF/lib/spring-core-4.1.3.RELEASE.jar rename to src/main/webapp/WEB-INF/lib/spring-core-4.1.3.RELEASE.jar diff --git a/WebContent/WEB-INF/lib/spring-expression-4.1.3.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-expression-4.1.3.RELEASE.jar similarity index 100% rename from WebContent/WEB-INF/lib/spring-expression-4.1.3.RELEASE.jar rename to src/main/webapp/WEB-INF/lib/spring-expression-4.1.3.RELEASE.jar diff --git a/WebContent/WEB-INF/lib/spring-jdbc-4.1.3.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-jdbc-4.1.3.RELEASE.jar similarity index 100% rename from WebContent/WEB-INF/lib/spring-jdbc-4.1.3.RELEASE.jar rename to src/main/webapp/WEB-INF/lib/spring-jdbc-4.1.3.RELEASE.jar diff --git a/WebContent/WEB-INF/lib/spring-jms-4.1.3.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-jms-4.1.3.RELEASE.jar similarity index 100% rename from WebContent/WEB-INF/lib/spring-jms-4.1.3.RELEASE.jar rename to src/main/webapp/WEB-INF/lib/spring-jms-4.1.3.RELEASE.jar diff --git a/WebContent/WEB-INF/lib/spring-messaging-4.1.3.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-messaging-4.1.3.RELEASE.jar similarity index 100% rename from WebContent/WEB-INF/lib/spring-messaging-4.1.3.RELEASE.jar rename to src/main/webapp/WEB-INF/lib/spring-messaging-4.1.3.RELEASE.jar diff --git a/WebContent/WEB-INF/lib/spring-tx-4.1.3.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-tx-4.1.3.RELEASE.jar similarity index 100% rename from WebContent/WEB-INF/lib/spring-tx-4.1.3.RELEASE.jar rename to src/main/webapp/WEB-INF/lib/spring-tx-4.1.3.RELEASE.jar diff --git a/WebContent/WEB-INF/lib/spring-web-4.1.3.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-web-4.1.3.RELEASE.jar similarity index 100% rename from WebContent/WEB-INF/lib/spring-web-4.1.3.RELEASE.jar rename to src/main/webapp/WEB-INF/lib/spring-web-4.1.3.RELEASE.jar diff --git a/WebContent/WEB-INF/lib/spring-webmvc-4.1.3.RELEASE.jar b/src/main/webapp/WEB-INF/lib/spring-webmvc-4.1.3.RELEASE.jar similarity index 100% rename from WebContent/WEB-INF/lib/spring-webmvc-4.1.3.RELEASE.jar rename to src/main/webapp/WEB-INF/lib/spring-webmvc-4.1.3.RELEASE.jar diff --git a/WebContent/WEB-INF/tld/commons.tld b/src/main/webapp/WEB-INF/tld/commons.tld similarity index 96% rename from WebContent/WEB-INF/tld/commons.tld rename to src/main/webapp/WEB-INF/tld/commons.tld index f288c9e..99d6062 100644 --- a/WebContent/WEB-INF/tld/commons.tld +++ b/src/main/webapp/WEB-INF/tld/commons.tld @@ -1,32 +1,32 @@ - - - - 2.0 - 1.2 - common - http://itcast.cn/common/ - Common Tag - Common Tag library - - - page - cn.itcast.common.utils.NavigationTag - JSP - create navigation for paging - - bean - true - - - number - true - - - url - true - true - - + + + + 2.0 + 1.2 + common + http://itcast.cn/common/ + Common Tag + Common Tag library + + + page + cn.itcast.common.utils.NavigationTag + JSP + create navigation for paging + + bean + true + + + number + true + + + url + true + true + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..be350e1 --- /dev/null +++ b/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,54 @@ + + + house + + index.html + index.htm + index.jsp + default.html + default.htm + default.jsp + + + + + contextConfigLocation + classpath:spring/spring-*.xml + + + org.springframework.web.context.ContextLoaderListener + + + + + + springMvc + org.springframework.web.servlet.DispatcherServlet + + contextConfigLocation + classpath:spring/spring-mvc.xml + + + 1 + + + springMvc + *.action + + + + + CharacterEncodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + utf-8 + + + + CharacterEncodingFilter + /* + + \ No newline at end of file diff --git a/WebContent/css/boot-crm.css b/src/main/webapp/css/boot-crm.css similarity index 94% rename from WebContent/css/boot-crm.css rename to src/main/webapp/css/boot-crm.css index 45aadaf..8e76ad4 100644 --- a/WebContent/css/boot-crm.css +++ b/src/main/webapp/css/boot-crm.css @@ -1,12 +1,12 @@ -.table th{ - text-align: center; - height:38px; -} -.table>tbody>tr>td,.panel-heading{ -text-align:center; -} - -/* dataTables表头居中 */ -.table>thead:first-child>tr:first-child>th{ -text-align:center; -} +.table th{ + text-align: center; + height:38px; +} +.table>tbody>tr>td,.panel-heading{ +text-align:center; +} + +/* dataTables表头居中 */ +.table>thead:first-child>tr:first-child>th{ +text-align:center; +} diff --git a/WebContent/css/bootstrap.min.css b/src/main/webapp/css/bootstrap.min.css similarity index 100% rename from WebContent/css/bootstrap.min.css rename to src/main/webapp/css/bootstrap.min.css diff --git a/WebContent/css/common.css b/src/main/webapp/css/common.css similarity index 99% rename from WebContent/css/common.css rename to src/main/webapp/css/common.css index 0b6cf9b..c4e1966 100644 --- a/WebContent/css/common.css +++ b/src/main/webapp/css/common.css @@ -1,122 +1,122 @@ -html{height:100%;} -body{font:14px/1.5 '微软雅黑';word-wrap:break-word;word-break:break-all;-webkit-text-size-adjust:none;background:#fff;color:#333;} -body,dl,dd,h1,h2,h3,h4,h5,h6,p,form,ul,ol,blockquote{margin:0} -img{border:0 none;vertical-align:middle} -input,select,textarea{font-size:14px;color:#333} -input{vertical-align:middle;padding:2px;margin:0} -table{border-collapse:collapse;border-spacing:0} -select,input,button{font:14px/20px Verdana,Simsun,Helvetica,Arial,sans-serif;} -em,i,cite,blockquote{font-style:normal} -ul,ol{list-style:none outside;padding:0} -h1,h2,h3,h4,h5,h6{font-size:100%} -textarea{overflow-y:auto;padding:3px} -a{color:#428bca;text-decoration:none;outline:0} -a:hover,a:active{color:#2a6496;text-decoration:none;} -a:focus{outline:0;} -button::-moz-focus-inner{border:0;padding:0;} -figure{margin:0} -article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block} -.ppr{position:relative;} -.ppa{position:absolute;} -.fl{float:left} -.fr{float:right} -.tl{text-align:left;} -.tc{text-align:center;} -.tr{text-align:right;} -.mlr5{margin:0 5px;} -.mt5{margin-top:5px;} -.mr5{margin-right:5px;} -.mt10{margin-top:10px;} -.ml5{margin-left:5px;} -.ml10{margin-left:10px;} -.mr10{margin-right:10px;} -.mb10{margin-bottom:10px;} -.mb20{margin-bottom:20px;} -.pl5{padding-left:5px;} -.pb10{padding-bottom:10px;} -.pt20{padding-top:20px;} -.pl10{padding-left:10px;} -.ptb20{padding:20px 0;} -.grayc{color:#ccc} -.gray6{color:#666} -.gray9{color:#999} -.emstyle{font-style:italic} -.clear{clear:both} -.clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden;} -.clearfix{*height:1%;} -.none{display:none} -.block{display:block;} -.minheight500{min-height:500px;height:auto !important;height:500px;overflow:visible;} -.wrap-box{width:960px;margin:0 auto;} -.blue,.blue a:link,.blue a:visited{color:blue;} -.blue a:hover{color:#f60;} -.white,.white a:link,.white a:visited{color:#fff;} -.white a:hover{color:#ff0;} -.red,.red a:link,.red a:visited{color:#f00;} -.red a:hover{color:#f60;} -.orange,.orange a:link,.orange a:visited{color:#ffa500;} -.orange a:hover{color:#f60;} -@font-face{font-family:'icomoon';src:url('../fonts/icomoon.eot');src:url('../fonts/icomoon.eot?#iefix') format('embedded-opentype'),url('../fonts/icomoon.woff') format('woff'),url('../fonts/icomoon.ttf') format('truetype'),url('../fonts/icomoon.svg#icomoon') format('svg');font-weight:normal;font-style:normal;} -.icon-font { font-family:'icomoon'; speak:none; font-weight:400; font-style:normal; font-variant:normal; text-transform:none; line-height:1; -webkit-font-smoothing:antialiased; } -.require-red{color:#f60;font-family:serif;margin-right:3px;} -/* common */ -.topbar-wrap{height:50px;line-height:50px;background:#1A1A1A;} -.topbar-logo-wrap{float:left;} -.topbar-inner{font-size:18px;padding:0 20px;} -.topbar-logo{float:left;width:150px;text-align:center;} -.navbar-list{float:left;} -.top-info-wrap{float:right;} -.navbar-list{} -.navbar-list li{float:left;} -.navbar-list li a{float:left;margin-right:5px;padding:0 25px;text-shadow:1px 1px 1px #000;} -.navbar-list li a:hover{background:#343434;} -.navbar-list li a.on{color:#fff;text-shadow:1px 1px 1px #003;background:#033b70;} -.top-info-list li{float:left;} -.top-info-list li a{float:left;margin-left:5px;padding:0 20px;display:inline;zoom:1;} -.top-info-list li a:hover{background:#343434;} -.btn{display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;font-size:14px;line-height:20px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top,#ffffff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#ffffff,#e6e6e6);background-image:-o-linear-gradient(top,#ffffff,#e6e6e6);background-image:linear-gradient(to bottom,#ffffff,#e6e6e6);background-repeat:repeat-x;border:1px solid #bbbbbb;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-bottom-color:#a2a2a2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);} -.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9;} -.btn:active,.btn.active{background-color:#cccccc \9;} -.btn:first-child{*margin-left:0;} -.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} -.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);} -.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;*background-color:#0044cc;background-image:-moz-linear-gradient(top,#0088cc,#0044cc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#0088cc),to(#0044cc));background-image:-webkit-linear-gradient(top,#0088cc,#0044cc);background-image:-o-linear-gradient(top,#0088cc,#0044cc);background-image:linear-gradient(to bottom,#0088cc,#0044cc);background-repeat:repeat-x;border-color:#0044cc #0044cc #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);} -.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#0044cc;*background-color:#003bb3;} -.btn-primary:active,.btn-primary.active{background-color:#003399 \9;} -.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;*background-color:#f89406;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);} -.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#f89406;*background-color:#df8505;} -.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;} -.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);} -.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#bd362f;*background-color:#a9302a;} -.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;} -.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);} -.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#ffffff;background-color:#51a351;*background-color:#499249;} -.btn-success:active,.btn-success.active{background-color:#408140 \9;} -.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);} -.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#ffffff;background-color:#2f96b4;*background-color:#2a85a0;} -.btn-info:active,.btn-info.active{background-color:#24748c \9;} -.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;*background-color:#222222;background-image:-moz-linear-gradient(top,#444444,#222222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444444),to(#222222));background-image:-webkit-linear-gradient(top,#444444,#222222);background-image:-o-linear-gradient(top,#444444,#222222);background-image:linear-gradient(to bottom,#444444,#222222);background-repeat:repeat-x;border-color:#222222 #222222 #000000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);} -.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#222222;*background-color:#151515;} -.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;} -.btn4{width:60px;} -.btn5{width:80px;} -.btn6{width:120px;} -.btn7{width:130px;} -.btn8{width:140px;} -.btn9{width:160px;} -.btn10{width:180px;} -.btn50{width:50%;} -.btn100{width:100%;} -textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#ffffff;border:1px solid #cccccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} -textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;/* IE6-9 */ --webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);} -.insert-tab{border-collapse:collapse;border:1px solid #eee;} -.insert-tab th,.insert-tab td{border:1px solid #eee;} -.insert-tab tr{line-height:40px;} -.insert-tab th{text-align:right;font-weight:normal;padding-right:10px;font-size:14px;} -.insert-tab td{text-align:left;padding-left:10px;} -.list-page{padding:20px 0;text-align:center;} -.list-page a{margin:0 5px;padding:2px 7px;border:1px solid #ccc;background:#f3f3f3;} -.list-page a:hover{background:#e4e4e4;border:1px solid #908f8f;} -.list-page .current{margin:0 5px;padding:2px 7px;background:#f60;border:1px solid #fe8101;color:#fff;} +html{height:100%;} +body{font:14px/1.5 '微软雅黑';word-wrap:break-word;word-break:break-all;-webkit-text-size-adjust:none;background:#fff;color:#333;} +body,dl,dd,h1,h2,h3,h4,h5,h6,p,form,ul,ol,blockquote{margin:0} +img{border:0 none;vertical-align:middle} +input,select,textarea{font-size:14px;color:#333} +input{vertical-align:middle;padding:2px;margin:0} +table{border-collapse:collapse;border-spacing:0} +select,input,button{font:14px/20px Verdana,Simsun,Helvetica,Arial,sans-serif;} +em,i,cite,blockquote{font-style:normal} +ul,ol{list-style:none outside;padding:0} +h1,h2,h3,h4,h5,h6{font-size:100%} +textarea{overflow-y:auto;padding:3px} +a{color:#428bca;text-decoration:none;outline:0} +a:hover,a:active{color:#2a6496;text-decoration:none;} +a:focus{outline:0;} +button::-moz-focus-inner{border:0;padding:0;} +figure{margin:0} +article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block} +.ppr{position:relative;} +.ppa{position:absolute;} +.fl{float:left} +.fr{float:right} +.tl{text-align:left;} +.tc{text-align:center;} +.tr{text-align:right;} +.mlr5{margin:0 5px;} +.mt5{margin-top:5px;} +.mr5{margin-right:5px;} +.mt10{margin-top:10px;} +.ml5{margin-left:5px;} +.ml10{margin-left:10px;} +.mr10{margin-right:10px;} +.mb10{margin-bottom:10px;} +.mb20{margin-bottom:20px;} +.pl5{padding-left:5px;} +.pb10{padding-bottom:10px;} +.pt20{padding-top:20px;} +.pl10{padding-left:10px;} +.ptb20{padding:20px 0;} +.grayc{color:#ccc} +.gray6{color:#666} +.gray9{color:#999} +.emstyle{font-style:italic} +.clear{clear:both} +.clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden;} +.clearfix{*height:1%;} +.none{display:none} +.block{display:block;} +.minheight500{min-height:500px;height:auto !important;height:500px;overflow:visible;} +.wrap-box{width:960px;margin:0 auto;} +.blue,.blue a:link,.blue a:visited{color:blue;} +.blue a:hover{color:#f60;} +.white,.white a:link,.white a:visited{color:#fff;} +.white a:hover{color:#ff0;} +.red,.red a:link,.red a:visited{color:#f00;} +.red a:hover{color:#f60;} +.orange,.orange a:link,.orange a:visited{color:#ffa500;} +.orange a:hover{color:#f60;} +@font-face{font-family:'icomoon';src:url('../fonts/icomoon.eot');src:url('../fonts/icomoon.eot?#iefix') format('embedded-opentype'),url('../fonts/icomoon.woff') format('woff'),url('../fonts/icomoon.ttf') format('truetype'),url('../fonts/icomoon.svg#icomoon') format('svg');font-weight:normal;font-style:normal;} +.icon-font { font-family:'icomoon'; speak:none; font-weight:400; font-style:normal; font-variant:normal; text-transform:none; line-height:1; -webkit-font-smoothing:antialiased; } +.require-red{color:#f60;font-family:serif;margin-right:3px;} +/* common */ +.topbar-wrap{height:50px;line-height:50px;background:#1A1A1A;} +.topbar-logo-wrap{float:left;} +.topbar-inner{font-size:18px;padding:0 20px;} +.topbar-logo{float:left;width:150px;text-align:center;} +.navbar-list{float:left;} +.top-info-wrap{float:right;} +.navbar-list{} +.navbar-list li{float:left;} +.navbar-list li a{float:left;margin-right:5px;padding:0 25px;text-shadow:1px 1px 1px #000;} +.navbar-list li a:hover{background:#343434;} +.navbar-list li a.on{color:#fff;text-shadow:1px 1px 1px #003;background:#033b70;} +.top-info-list li{float:left;} +.top-info-list li a{float:left;margin-left:5px;padding:0 20px;display:inline;zoom:1;} +.top-info-list li a:hover{background:#343434;} +.btn{display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;font-size:14px;line-height:20px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top,#ffffff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#ffffff,#e6e6e6);background-image:-o-linear-gradient(top,#ffffff,#e6e6e6);background-image:linear-gradient(to bottom,#ffffff,#e6e6e6);background-repeat:repeat-x;border:1px solid #bbbbbb;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-bottom-color:#a2a2a2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);} +.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9;} +.btn:active,.btn.active{background-color:#cccccc \9;} +.btn:first-child{*margin-left:0;} +.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} +.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);} +.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;*background-color:#0044cc;background-image:-moz-linear-gradient(top,#0088cc,#0044cc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#0088cc),to(#0044cc));background-image:-webkit-linear-gradient(top,#0088cc,#0044cc);background-image:-o-linear-gradient(top,#0088cc,#0044cc);background-image:linear-gradient(to bottom,#0088cc,#0044cc);background-repeat:repeat-x;border-color:#0044cc #0044cc #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);} +.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#0044cc;*background-color:#003bb3;} +.btn-primary:active,.btn-primary.active{background-color:#003399 \9;} +.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;*background-color:#f89406;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);} +.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#f89406;*background-color:#df8505;} +.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;} +.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);} +.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#bd362f;*background-color:#a9302a;} +.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;} +.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);} +.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#ffffff;background-color:#51a351;*background-color:#499249;} +.btn-success:active,.btn-success.active{background-color:#408140 \9;} +.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);} +.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#ffffff;background-color:#2f96b4;*background-color:#2a85a0;} +.btn-info:active,.btn-info.active{background-color:#24748c \9;} +.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;*background-color:#222222;background-image:-moz-linear-gradient(top,#444444,#222222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444444),to(#222222));background-image:-webkit-linear-gradient(top,#444444,#222222);background-image:-o-linear-gradient(top,#444444,#222222);background-image:linear-gradient(to bottom,#444444,#222222);background-repeat:repeat-x;border-color:#222222 #222222 #000000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);} +.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#222222;*background-color:#151515;} +.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;} +.btn4{width:60px;} +.btn5{width:80px;} +.btn6{width:120px;} +.btn7{width:130px;} +.btn8{width:140px;} +.btn9{width:160px;} +.btn10{width:180px;} +.btn50{width:50%;} +.btn100{width:100%;} +textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#ffffff;border:1px solid #cccccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} +textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;/* IE6-9 */ +-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);} +.insert-tab{border-collapse:collapse;border:1px solid #eee;} +.insert-tab th,.insert-tab td{border:1px solid #eee;} +.insert-tab tr{line-height:40px;} +.insert-tab th{text-align:right;font-weight:normal;padding-right:10px;font-size:14px;} +.insert-tab td{text-align:left;padding-left:10px;} +.list-page{padding:20px 0;text-align:center;} +.list-page a{margin:0 5px;padding:2px 7px;border:1px solid #ccc;background:#f3f3f3;} +.list-page a:hover{background:#e4e4e4;border:1px solid #908f8f;} +.list-page .current{margin:0 5px;padding:2px 7px;background:#f60;border:1px solid #fe8101;color:#fff;} diff --git a/WebContent/css/dataTables.bootstrap.css b/src/main/webapp/css/dataTables.bootstrap.css similarity index 100% rename from WebContent/css/dataTables.bootstrap.css rename to src/main/webapp/css/dataTables.bootstrap.css diff --git a/WebContent/css/font-awesome.min.css b/src/main/webapp/css/font-awesome.min.css similarity index 100% rename from WebContent/css/font-awesome.min.css rename to src/main/webapp/css/font-awesome.min.css diff --git a/WebContent/css/jquery-ui.css b/src/main/webapp/css/jquery-ui.css similarity index 98% rename from WebContent/css/jquery-ui.css rename to src/main/webapp/css/jquery-ui.css index 90bc456..b7bee5c 100644 --- a/WebContent/css/jquery-ui.css +++ b/src/main/webapp/css/jquery-ui.css @@ -1,404 +1,404 @@ -/* -* jQuery UI CSS Framework -* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) -* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. -*/ - -/* Layout helpers -----------------------------------*/ -.ui-helper-hidden { display: none; } -.ui-helper-hidden-accessible { position: absolute; left: -99999999px; } -.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } -.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -.ui-helper-clearfix { display: inline-block; } -/* required comment for clearfix to work in Opera \*/ -* html .ui-helper-clearfix { height:1%; } -.ui-helper-clearfix { display:block; } -/* end clearfix */ -.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } - - -/* Interaction Cues -----------------------------------*/ -.ui-state-disabled { cursor: default !important; } - - -/* Icons -----------------------------------*/ - -/* states and images */ -.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } - - -/* Misc visuals -----------------------------------*/ - -/* Overlays */ -.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } - -/* -* jQuery UI CSS Framework -* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) -* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. -* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px -*/ - - -/* Component containers -----------------------------------*/ -.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; } -.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } -.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } -.ui-widget-content a { color: #222222; } -.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } -.ui-widget-header a { color: #222222; } - -/* Interaction states -----------------------------------*/ -.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; outline: none; } -.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; outline: none; } -.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; outline: none; } -.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; outline: none; } -.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; outline: none; } -.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; outline: none; text-decoration: none; } - -/* Interaction Cues -----------------------------------*/ -.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; } -.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #363636; } -.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; } -.ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a; } -.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a; } -.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } -.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; } -.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } - -/* Icons -----------------------------------*/ - -/* states and images */ -.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } -.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } -.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } -.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); } -.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } -.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } -.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); } -.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); } - -/* positioning */ -.ui-icon-carat-1-n { background-position: 0 0; } -.ui-icon-carat-1-ne { background-position: -16px 0; } -.ui-icon-carat-1-e { background-position: -32px 0; } -.ui-icon-carat-1-se { background-position: -48px 0; } -.ui-icon-carat-1-s { background-position: -64px 0; } -.ui-icon-carat-1-sw { background-position: -80px 0; } -.ui-icon-carat-1-w { background-position: -96px 0; } -.ui-icon-carat-1-nw { background-position: -112px 0; } -.ui-icon-carat-2-n-s { background-position: -128px 0; } -.ui-icon-carat-2-e-w { background-position: -144px 0; } -.ui-icon-triangle-1-n { background-position: 0 -16px; } -.ui-icon-triangle-1-ne { background-position: -16px -16px; } -.ui-icon-triangle-1-e { background-position: -32px -16px; } -.ui-icon-triangle-1-se { background-position: -48px -16px; } -.ui-icon-triangle-1-s { background-position: -64px -16px; } -.ui-icon-triangle-1-sw { background-position: -80px -16px; } -.ui-icon-triangle-1-w { background-position: -96px -16px; } -.ui-icon-triangle-1-nw { background-position: -112px -16px; } -.ui-icon-triangle-2-n-s { background-position: -128px -16px; } -.ui-icon-triangle-2-e-w { background-position: -144px -16px; } -.ui-icon-arrow-1-n { background-position: 0 -32px; } -.ui-icon-arrow-1-ne { background-position: -16px -32px; } -.ui-icon-arrow-1-e { background-position: -32px -32px; } -.ui-icon-arrow-1-se { background-position: -48px -32px; } -.ui-icon-arrow-1-s { background-position: -64px -32px; } -.ui-icon-arrow-1-sw { background-position: -80px -32px; } -.ui-icon-arrow-1-w { background-position: -96px -32px; } -.ui-icon-arrow-1-nw { background-position: -112px -32px; } -.ui-icon-arrow-2-n-s { background-position: -128px -32px; } -.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } -.ui-icon-arrow-2-e-w { background-position: -160px -32px; } -.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } -.ui-icon-arrowstop-1-n { background-position: -192px -32px; } -.ui-icon-arrowstop-1-e { background-position: -208px -32px; } -.ui-icon-arrowstop-1-s { background-position: -224px -32px; } -.ui-icon-arrowstop-1-w { background-position: -240px -32px; } -.ui-icon-arrowthick-1-n { background-position: 0 -48px; } -.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } -.ui-icon-arrowthick-1-e { background-position: -32px -48px; } -.ui-icon-arrowthick-1-se { background-position: -48px -48px; } -.ui-icon-arrowthick-1-s { background-position: -64px -48px; } -.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } -.ui-icon-arrowthick-1-w { background-position: -96px -48px; } -.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } -.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } -.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } -.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } -.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } -.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } -.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } -.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } -.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } -.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } -.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } -.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } -.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } -.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } -.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } -.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } -.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } -.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } -.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } -.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } -.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } -.ui-icon-arrow-4 { background-position: 0 -80px; } -.ui-icon-arrow-4-diag { background-position: -16px -80px; } -.ui-icon-extlink { background-position: -32px -80px; } -.ui-icon-newwin { background-position: -48px -80px; } -.ui-icon-refresh { background-position: -64px -80px; } -.ui-icon-shuffle { background-position: -80px -80px; } -.ui-icon-transfer-e-w { background-position: -96px -80px; } -.ui-icon-transferthick-e-w { background-position: -112px -80px; } -.ui-icon-folder-collapsed { background-position: 0 -96px; } -.ui-icon-folder-open { background-position: -16px -96px; } -.ui-icon-document { background-position: -32px -96px; } -.ui-icon-document-b { background-position: -48px -96px; } -.ui-icon-note { background-position: -64px -96px; } -.ui-icon-mail-closed { background-position: -80px -96px; } -.ui-icon-mail-open { background-position: -96px -96px; } -.ui-icon-suitcase { background-position: -112px -96px; } -.ui-icon-comment { background-position: -128px -96px; } -.ui-icon-person { background-position: -144px -96px; } -.ui-icon-print { background-position: -160px -96px; } -.ui-icon-trash { background-position: -176px -96px; } -.ui-icon-locked { background-position: -192px -96px; } -.ui-icon-unlocked { background-position: -208px -96px; } -.ui-icon-bookmark { background-position: -224px -96px; } -.ui-icon-tag { background-position: -240px -96px; } -.ui-icon-home { background-position: 0 -112px; } -.ui-icon-flag { background-position: -16px -112px; } -.ui-icon-calendar { background-position: -32px -112px; } -.ui-icon-cart { background-position: -48px -112px; } -.ui-icon-pencil { background-position: -64px -112px; } -.ui-icon-clock { background-position: -80px -112px; } -.ui-icon-disk { background-position: -96px -112px; } -.ui-icon-calculator { background-position: -112px -112px; } -.ui-icon-zoomin { background-position: -128px -112px; } -.ui-icon-zoomout { background-position: -144px -112px; } -.ui-icon-search { background-position: -160px -112px; } -.ui-icon-wrench { background-position: -176px -112px; } -.ui-icon-gear { background-position: -192px -112px; } -.ui-icon-heart { background-position: -208px -112px; } -.ui-icon-star { background-position: -224px -112px; } -.ui-icon-link { background-position: -240px -112px; } -.ui-icon-cancel { background-position: 0 -128px; } -.ui-icon-plus { background-position: -16px -128px; } -.ui-icon-plusthick { background-position: -32px -128px; } -.ui-icon-minus { background-position: -48px -128px; } -.ui-icon-minusthick { background-position: -64px -128px; } -.ui-icon-close { background-position: -80px -128px; } -.ui-icon-closethick { background-position: -96px -128px; } -.ui-icon-key { background-position: -112px -128px; } -.ui-icon-lightbulb { background-position: -128px -128px; } -.ui-icon-scissors { background-position: -144px -128px; } -.ui-icon-clipboard { background-position: -160px -128px; } -.ui-icon-copy { background-position: -176px -128px; } -.ui-icon-contact { background-position: -192px -128px; } -.ui-icon-image { background-position: -208px -128px; } -.ui-icon-video { background-position: -224px -128px; } -.ui-icon-script { background-position: -240px -128px; } -.ui-icon-alert { background-position: 0 -144px; } -.ui-icon-info { background-position: -16px -144px; } -.ui-icon-notice { background-position: -32px -144px; } -.ui-icon-help { background-position: -48px -144px; } -.ui-icon-check { background-position: -64px -144px; } -.ui-icon-bullet { background-position: -80px -144px; } -.ui-icon-radio-off { background-position: -96px -144px; } -.ui-icon-radio-on { background-position: -112px -144px; } -.ui-icon-pin-w { background-position: -128px -144px; } -.ui-icon-pin-s { background-position: -144px -144px; } -.ui-icon-play { background-position: 0 -160px; } -.ui-icon-pause { background-position: -16px -160px; } -.ui-icon-seek-next { background-position: -32px -160px; } -.ui-icon-seek-prev { background-position: -48px -160px; } -.ui-icon-seek-end { background-position: -64px -160px; } -.ui-icon-seek-first { background-position: -80px -160px; } -.ui-icon-stop { background-position: -96px -160px; } -.ui-icon-eject { background-position: -112px -160px; } -.ui-icon-volume-off { background-position: -128px -160px; } -.ui-icon-volume-on { background-position: -144px -160px; } -.ui-icon-power { background-position: 0 -176px; } -.ui-icon-signal-diag { background-position: -16px -176px; } -.ui-icon-signal { background-position: -32px -176px; } -.ui-icon-battery-0 { background-position: -48px -176px; } -.ui-icon-battery-1 { background-position: -64px -176px; } -.ui-icon-battery-2 { background-position: -80px -176px; } -.ui-icon-battery-3 { background-position: -96px -176px; } -.ui-icon-circle-plus { background-position: 0 -192px; } -.ui-icon-circle-minus { background-position: -16px -192px; } -.ui-icon-circle-close { background-position: -32px -192px; } -.ui-icon-circle-triangle-e { background-position: -48px -192px; } -.ui-icon-circle-triangle-s { background-position: -64px -192px; } -.ui-icon-circle-triangle-w { background-position: -80px -192px; } -.ui-icon-circle-triangle-n { background-position: -96px -192px; } -.ui-icon-circle-arrow-e { background-position: -112px -192px; } -.ui-icon-circle-arrow-s { background-position: -128px -192px; } -.ui-icon-circle-arrow-w { background-position: -144px -192px; } -.ui-icon-circle-arrow-n { background-position: -160px -192px; } -.ui-icon-circle-zoomin { background-position: -176px -192px; } -.ui-icon-circle-zoomout { background-position: -192px -192px; } -.ui-icon-circle-check { background-position: -208px -192px; } -.ui-icon-circlesmall-plus { background-position: 0 -208px; } -.ui-icon-circlesmall-minus { background-position: -16px -208px; } -.ui-icon-circlesmall-close { background-position: -32px -208px; } -.ui-icon-squaresmall-plus { background-position: -48px -208px; } -.ui-icon-squaresmall-minus { background-position: -64px -208px; } -.ui-icon-squaresmall-close { background-position: -80px -208px; } -.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } -.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } -.ui-icon-grip-solid-vertical { background-position: -32px -224px; } -.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } -.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } -.ui-icon-grip-diagonal-se { background-position: -80px -224px; } - - -/* Misc visuals -----------------------------------*/ - -/* Corner radius */ -.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; } -.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; } -.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; } -.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; } -.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; } -.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; } -.ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; } -.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; } -.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; } - -/* Overlays */ -.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } -.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; }/* Accordion -----------------------------------*/ -.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; } -.ui-accordion .ui-accordion-li-fix { display: inline; } -.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; } -.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; } -.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } -.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; } -.ui-accordion .ui-accordion-content-active { display: block; }/* Datepicker -----------------------------------*/ -.ui-datepicker { width: 200px; padding: .2em .2em 0; } -.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } -.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } -.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } -.ui-datepicker .ui-datepicker-prev { left:2px; } -.ui-datepicker .ui-datepicker-next { right:2px; } -.ui-datepicker .ui-datepicker-prev-hover { left:1px; } -.ui-datepicker .ui-datepicker-next-hover { right:1px; } -.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } -.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 26px; text-align: center; } -.ui-datepicker .ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; } -.ui-datepicker select.ui-datepicker-month-year {width: 100%;} -.ui-datepicker select.ui-datepicker-month, -.ui-datepicker select.ui-datepicker-year { width: 49%;} -.ui-datepicker .ui-datepicker-title select.ui-datepicker-year { float: right; } -.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } -.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } -.ui-datepicker td { border: 0; padding: 1px; } -.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } -.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } -.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } -.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } - -/* with multiple calendars */ -.ui-datepicker.ui-datepicker-multi { width:auto; } -.ui-datepicker-multi .ui-datepicker-group { float:left; } -.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } -.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } -.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } -.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } -.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } -.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } -.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } -.ui-datepicker-row-break { clear:both; width:100%; } - -/* RTL support */ -.ui-datepicker-rtl { direction: rtl; } -.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } -.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } -.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } -.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } -.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } -.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } -.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } -.ui-datepicker-rtl .ui-datepicker-group { float:right; } -.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } -.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } - -/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ -.ui-datepicker-cover { - display: none; /*sorry for IE5*/ - display/**/: block; /*sorry for IE5*/ - position: absolute; /*must have*/ - z-index: -1; /*must have*/ - filter: mask(); /*must have*/ - top: -4px; /*must have*/ - left: -4px; /*must have*/ - width: 200px; /*must have*/ - height: 200px; /*must have*/ -}/* Dialog -----------------------------------*/ -.ui-dialog { position: relative; padding: .2em; width: 300px; } -.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative; } -.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; } -.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } -.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } -.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } -.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } -.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } -.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; } -.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } -.ui-draggable .ui-dialog-titlebar { cursor: move; } -/* Progressbar -----------------------------------*/ -.ui-progressbar { height:2em; text-align: left; } -.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/* Resizable -----------------------------------*/ -.ui-resizable { position: relative;} -.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;} -.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } -.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0px; } -.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0px; } -.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0px; height: 100%; } -.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0px; height: 100%; } -.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } -.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } -.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } -.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Slider -----------------------------------*/ -.ui-slider { position: relative; text-align: left; } -.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } -.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; } - -.ui-slider-horizontal { height: .8em; } -.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } -.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; } -.ui-slider-horizontal .ui-slider-range-min { left: 0; } -.ui-slider-horizontal .ui-slider-range-max { right: 0; } - -.ui-slider-vertical { width: .8em; height: 100px; } -.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; } -.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } -.ui-slider-vertical .ui-slider-range-min { bottom: 0; } -.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs -----------------------------------*/ -.ui-tabs { padding: .2em; zoom: 1; } -.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; } -.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; } -.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; } -.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0; } -.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; } -.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ -.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; } -.ui-tabs .ui-tabs-hide { display: none !important; } +/* +* jQuery UI CSS Framework +* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) +* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. +*/ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { display: none; } +.ui-helper-hidden-accessible { position: absolute; left: -99999999px; } +.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } +.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } +.ui-helper-clearfix { display: inline-block; } +/* required comment for clearfix to work in Opera \*/ +* html .ui-helper-clearfix { height:1%; } +.ui-helper-clearfix { display:block; } +/* end clearfix */ +.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { cursor: default !important; } + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } + +/* +* jQuery UI CSS Framework +* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) +* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px +*/ + + +/* Component containers +----------------------------------*/ +.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; } +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } +.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content a { color: #222222; } +.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } +.ui-widget-header a { color: #222222; } + +/* Interaction states +----------------------------------*/ +.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; outline: none; } +.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; outline: none; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; outline: none; } +.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; outline: none; } +.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; outline: none; } +.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; outline: none; text-decoration: none; } + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; } +.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #363636; } +.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; } +.ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a; } +.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a; } +.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } +.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; } +.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); } +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } +.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } +.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); } +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); } + +/* positioning */ +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-off { background-position: -96px -144px; } +.ui-icon-radio-on { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; } +.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; } +.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; } +.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; } +.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; } +.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; } +.ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; } +.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; } +.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; } + +/* Overlays */ +.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } +.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; }/* Accordion +----------------------------------*/ +.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; } +.ui-accordion .ui-accordion-li-fix { display: inline; } +.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; } +.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; } +.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } +.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; } +.ui-accordion .ui-accordion-content-active { display: block; }/* Datepicker +----------------------------------*/ +.ui-datepicker { width: 200px; padding: .2em .2em 0; } +.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } +.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } +.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } +.ui-datepicker .ui-datepicker-prev { left:2px; } +.ui-datepicker .ui-datepicker-next { right:2px; } +.ui-datepicker .ui-datepicker-prev-hover { left:1px; } +.ui-datepicker .ui-datepicker-next-hover { right:1px; } +.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } +.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 26px; text-align: center; } +.ui-datepicker .ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; } +.ui-datepicker select.ui-datepicker-month-year {width: 100%;} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { width: 49%;} +.ui-datepicker .ui-datepicker-title select.ui-datepicker-year { float: right; } +.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } +.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } +.ui-datepicker td { border: 0; padding: 1px; } +.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } +.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } +.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } + +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { width:auto; } +.ui-datepicker-multi .ui-datepicker-group { float:left; } +.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } +.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } +.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } +.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } +.ui-datepicker-row-break { clear:both; width:100%; } + +/* RTL support */ +.ui-datepicker-rtl { direction: rtl; } +.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } +.ui-datepicker-rtl .ui-datepicker-group { float:right; } +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } + +/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ +.ui-datepicker-cover { + display: none; /*sorry for IE5*/ + display/**/: block; /*sorry for IE5*/ + position: absolute; /*must have*/ + z-index: -1; /*must have*/ + filter: mask(); /*must have*/ + top: -4px; /*must have*/ + left: -4px; /*must have*/ + width: 200px; /*must have*/ + height: 200px; /*must have*/ +}/* Dialog +----------------------------------*/ +.ui-dialog { position: relative; padding: .2em; width: 300px; } +.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative; } +.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; } +.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } +.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } +.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } +.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } +.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } +.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; } +.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } +.ui-draggable .ui-dialog-titlebar { cursor: move; } +/* Progressbar +----------------------------------*/ +.ui-progressbar { height:2em; text-align: left; } +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/* Resizable +----------------------------------*/ +.ui-resizable { position: relative;} +.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;} +.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } +.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0px; } +.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0px; } +.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0px; height: 100%; } +.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0px; height: 100%; } +.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } +.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } +.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } +.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Slider +----------------------------------*/ +.ui-slider { position: relative; text-align: left; } +.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } +.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; } + +.ui-slider-horizontal { height: .8em; } +.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } +.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; } +.ui-slider-horizontal .ui-slider-range-min { left: 0; } +.ui-slider-horizontal .ui-slider-range-max { right: 0; } + +.ui-slider-vertical { width: .8em; height: 100px; } +.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; } +.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } +.ui-slider-vertical .ui-slider-range-min { bottom: 0; } +.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs +----------------------------------*/ +.ui-tabs { padding: .2em; zoom: 1; } +.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; } +.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; } +.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; } +.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0; } +.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; } +.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ +.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; } +.ui-tabs .ui-tabs-hide { display: none !important; } diff --git a/WebContent/css/main.css b/src/main/webapp/css/main.css similarity index 98% rename from WebContent/css/main.css rename to src/main/webapp/css/main.css index c8726f2..0421b9b 100644 --- a/WebContent/css/main.css +++ b/src/main/webapp/css/main.css @@ -1,58 +1,58 @@ -.sidebar-wrap{float: left;width: 189px;min-height:700px;background: #f2f2f2;border-right:1px solid #ccc;/*cursor:e-resize;*/} -.main-wrap{margin-left: 190px;min-height:100%;} -.sidebar-title{height: 40px;line-height: 40px;text-indent:1em;font-size: 24px;text-align: left;} -.sidebar-title h1{font-weight: normal;} -.sidebar-content{padding-top: 5px;} -.sidebar-list li{border:1px solid #e5e5e5;border-width:1px 0;} -.sidebar-list li .icon-font{margin-right: 5px;color: #888;font-size: 14px;} -.sidebar-list li a{padding: 0 16px 0 20px;display: block;height: 38px;line-height: 38px;color: #333;} -.sidebar-list li a:hover{background: #fff;color: #1963AA;} -.sub-menu{border-top: 1px solid #e5e5e5;background: #fff;} -.sub-menu li{padding-left: 21px;} -.sub-menu li.on{background: #1963AA;} -.sub-menu li.on a{background: #1963AA;color: #fff;} -.sub-menu li.on .icon-font{color: #fff;} -.sub-menu .icon-font{font-size: 11px;} -/* main */ -.crumb-wrap{height: 40px;line-height: 39px;border-bottom: 1px solid #e5e5e5;background: #f5f5f5;} -.crumb-list{padding-left: 12px;} -.crumb-list .icon-font{margin-right: 5px;} -.crumb-step{margin: 0 5px;color: #b2c2e0;font-family: serif;} -.search-wrap{padding: 15px 0;border-bottom: 1px solid #e5e5e5;} -.search-tab tr{line-height: 35px;} -.search-tab th{text-align: right;padding-right:10px;font-weight: normal;} -.search-tab td{padding: 0 5px;} -.common-text{height: 23px;line-height: 23px;padding: 2px 4px;border: 1px solid #ccc;background: #fff;border-radius:5px;} -.result-wrap{padding:10px 20px;border-bottom: 1px solid #e5e5e5;} -.result-title{line-height: 35px;padding-bottom: 5px;overflow: hidden;} -.comment-title{line-height: 35px;margin-bottom: 10px;overflow: hidden;} -.result-list a{margin-right: 15px;} -.result-list i{padding-right: 5px;} -.result-tab{border-collapse:collapse;border: 1px solid #ddd;} -.result-tab th{font-weight: normal;font-size: 15px;text-align: left;background: url(../images/tab-thbg.png) #f9f9f9 0 bottom repeat-x;} -.result-tab th,.result-tab td{padding:5px;border-bottom: 1px solid #ddd;border-right: 1px solid #e1e1e1;} -.result-tab tr{line-height:35px;} -.result-tab th.tc,.result-tab td.tc{text-align: center;} -.result-tab tr:nth-child(odd){background: #f9f9f9;} -.result-tab tr:hover{background: #f1f1f1;} -.result-tab tr.even-tr{background: #e9fff2;} -.comment-tab{border-bottom: 1px solid #ddd;padding-left: 15px;margin-bottom: 10px;} -.comment-tab a{float: left;} -.comment-tab a.on{padding: 0 15px;background: #49afcd;color: #fff;border-radius:5px 5px 0 0;} -/* config */ -.config-items{margin-bottom: 25px;} -.config-title{margin-bottom: 10px;} -.config-title h1{font-size: 14px;font-weight: normal;} -.config-title h1 i{margin-right: 5px;font-size: 12px;} -.columns-title{padding: 10px 0;height: 35px;line-height: 35px;overflow: hidden;} -/*.columns-title .comment-tab{padding-left: 0;}*/ -.visitor-img{float: left;} -.visitor-info{float: left;padding-left: 10px;line-height:23px;} -.visitor-email{color: #aaa;} -.short-wrap a{margin-right: 20px;} -.short-wrap a i{margin-right: 5px;} -.res-lab{display: inline-block;width: 150px;padding-right: 10px;text-align: right;} -.sys-info-list li{line-height: 35px;border-bottom: 1px dashed #eaeaea;} -.res-lab{color: #909090;} -.res-info{font-size: 15px;} -.sort-input{width: 25px;text-align: center;} +.sidebar-wrap{float: left;width: 189px;min-height:700px;background: #f2f2f2;border-right:1px solid #ccc;/*cursor:e-resize;*/} +.main-wrap{margin-left: 190px;min-height:100%;} +.sidebar-title{height: 40px;line-height: 40px;text-indent:1em;font-size: 24px;text-align: left;} +.sidebar-title h1{font-weight: normal;} +.sidebar-content{padding-top: 5px;} +.sidebar-list li{border:1px solid #e5e5e5;border-width:1px 0;} +.sidebar-list li .icon-font{margin-right: 5px;color: #888;font-size: 14px;} +.sidebar-list li a{padding: 0 16px 0 20px;display: block;height: 38px;line-height: 38px;color: #333;} +.sidebar-list li a:hover{background: #fff;color: #1963AA;} +.sub-menu{border-top: 1px solid #e5e5e5;background: #fff;} +.sub-menu li{padding-left: 21px;} +.sub-menu li.on{background: #1963AA;} +.sub-menu li.on a{background: #1963AA;color: #fff;} +.sub-menu li.on .icon-font{color: #fff;} +.sub-menu .icon-font{font-size: 11px;} +/* main */ +.crumb-wrap{height: 40px;line-height: 39px;border-bottom: 1px solid #e5e5e5;background: #f5f5f5;} +.crumb-list{padding-left: 12px;} +.crumb-list .icon-font{margin-right: 5px;} +.crumb-step{margin: 0 5px;color: #b2c2e0;font-family: serif;} +.search-wrap{padding: 15px 0;border-bottom: 1px solid #e5e5e5;} +.search-tab tr{line-height: 35px;} +.search-tab th{text-align: right;padding-right:10px;font-weight: normal;} +.search-tab td{padding: 0 5px;} +.common-text{height: 23px;line-height: 23px;padding: 2px 4px;border: 1px solid #ccc;background: #fff;border-radius:5px;} +.result-wrap{padding:10px 20px;border-bottom: 1px solid #e5e5e5;} +.result-title{line-height: 35px;padding-bottom: 5px;overflow: hidden;} +.comment-title{line-height: 35px;margin-bottom: 10px;overflow: hidden;} +.result-list a{margin-right: 15px;} +.result-list i{padding-right: 5px;} +.result-tab{border-collapse:collapse;border: 1px solid #ddd;} +.result-tab th{font-weight: normal;font-size: 15px;text-align: left;background: url(../images/tab-thbg.png) #f9f9f9 0 bottom repeat-x;} +.result-tab th,.result-tab td{padding:5px;border-bottom: 1px solid #ddd;border-right: 1px solid #e1e1e1;} +.result-tab tr{line-height:35px;} +.result-tab th.tc,.result-tab td.tc{text-align: center;} +.result-tab tr:nth-child(odd){background: #f9f9f9;} +.result-tab tr:hover{background: #f1f1f1;} +.result-tab tr.even-tr{background: #e9fff2;} +.comment-tab{border-bottom: 1px solid #ddd;padding-left: 15px;margin-bottom: 10px;} +.comment-tab a{float: left;} +.comment-tab a.on{padding: 0 15px;background: #49afcd;color: #fff;border-radius:5px 5px 0 0;} +/* config */ +.config-items{margin-bottom: 25px;} +.config-title{margin-bottom: 10px;} +.config-title h1{font-size: 14px;font-weight: normal;} +.config-title h1 i{margin-right: 5px;font-size: 12px;} +.columns-title{padding: 10px 0;height: 35px;line-height: 35px;overflow: hidden;} +/*.columns-title .comment-tab{padding-left: 0;}*/ +.visitor-img{float: left;} +.visitor-info{float: left;padding-left: 10px;line-height:23px;} +.visitor-email{color: #aaa;} +.short-wrap a{margin-right: 20px;} +.short-wrap a i{margin-right: 5px;} +.res-lab{display: inline-block;width: 150px;padding-right: 10px;text-align: right;} +.sys-info-list li{line-height: 35px;border-bottom: 1px dashed #eaeaea;} +.res-lab{color: #909090;} +.res-info{font-size: 15px;} +.sort-input{width: 25px;text-align: center;} diff --git a/WebContent/css/metisMenu.min.css b/src/main/webapp/css/metisMenu.min.css similarity index 100% rename from WebContent/css/metisMenu.min.css rename to src/main/webapp/css/metisMenu.min.css diff --git a/WebContent/css/sb-admin-2.css b/src/main/webapp/css/sb-admin-2.css similarity index 100% rename from WebContent/css/sb-admin-2.css rename to src/main/webapp/css/sb-admin-2.css diff --git a/WebContent/css/style1.css b/src/main/webapp/css/style1.css similarity index 95% rename from WebContent/css/style1.css rename to src/main/webapp/css/style1.css index a08a075..25a889e 100644 --- a/WebContent/css/style1.css +++ b/src/main/webapp/css/style1.css @@ -1,548 +1,548 @@ - -/*------------- FONTS --------------------------------------------------------------------------------- */ -/* Generated by Font Squirrel (http://www.fontsquirrel.com)*/ - -@font-face { - font-family: 'OpenSansLight'; - src: url('../fonts/OpenSans-Light-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'OpenSansRegular'; - src: url('../fonts/OpenSans-Regular-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'OpenSansSemibold'; - src: url('../fonts/OpenSans-Semibold-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'OpenSansBold'; - src: url('../fonts/OpenSans-Bold-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; - -} - - - -body{ - background-color:rgb(255,255,255); - background-image:url("../img/colbg.jpg"); - background-repeat:repeat-x; - background-position:0px 40px; - overflow-y:auto; -} -body#landingBody{ - background-position:0px 0px; -} - -.navbar .brand i{ - margin-top:5px; -} -.navbar .brand{ - color:rgb(255,255,255); - - -webkit-transition:color .2s ease-in-out; - cursor:pointer; -} -.navbar .brand:hover{ - color:rgba(0,215,249,1); -} - -.navbar .nav a:hover{ - -webkit-transition:color .3s ease-in-out; -} - -.navbar .navbar-inner{ - box-shadow:none; -} - -.navbar.blacktrans .navbar-inner{ -background: -moz-linear-gradient(top, rgba(51,51,51,0.8) 0%, rgba(34,34,34,0.85) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(51,51,51,0.8)), color-stop(100%,rgba(34,34,34,0.85))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(51,51,51,0.8) 0%,rgba(34,34,34,0.85) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(51,51,51,0.8) 0%,rgba(34,34,34,0.85) 100%); /* Opera 11.10+ */ -background: -ms-linear-gradient(top, rgba(51,51,51,0.8) 0%,rgba(34,34,34,0.85) 100%); /* IE10+ */ -background: linear-gradient(top, rgba(51,51,51,0.8) 0%,rgba(34,34,34,0.85) 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cc333333', endColorstr='#d9222222',GradientType=0 ); /* IE6-9 */ - -} -.navbar.blue .navbar-inner{ -background: -moz-linear-gradient(top, rgba(9,86,174,0.8) 0%, rgba(2,74,158,0.85) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(9,86,174,0.8)), color-stop(100%,rgba(2,74,158,0.85))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(9,86,174,0.8) 0%,rgba(2,74,158,0.85) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(9,86,174,0.8) 0%,rgba(2,74,158,0.85) 100%); /* Opera 11.10+ */ -background: -ms-linear-gradient(top, rgba(9,86,174,0.8) 0%,rgba(2,74,158,0.85) 100%); /* IE10+ */ -background: linear-gradient(top, rgba(9,86,174,0.8) 0%,rgba(2,74,158,0.85) 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cc0956ae', endColorstr='#d9024a9e',GradientType=0 ); /* IE6-9 */ -} - -.navbar.blue2 .navbar-inner{ - background: #0956ae; -background: -moz-linear-gradient(top, #0956ae 0%, #024a9e 100%); -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0956ae), color-stop(100%,#024a9e)); -background: -webkit-linear-gradient(top, #0956ae 0%,#024a9e 100%); -background: -o-linear-gradient(top, #0956ae 0%,#024a9e 100%); -background: -ms-linear-gradient(top, #0956ae 0%,#024a9e 100%); -background: linear-gradient(top, #0956ae 0%,#024a9e 100%); -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0956ae', endColorstr='#024a9e',GradientType=0 ); - -} -.navbar.blue .nav > li > a{ - color:rgb(255,255,255); - opacity:0.8; - -webkit-transition:opacity .3s ease-in-out; -} -.navbar.blue .nav > li > a:hover{ - opacity:1; -} -.navbar.blue .nav > .active > a{ - opacity:1; - background-color:rgba(0,0,0,0.2); -} - -.navbar-search { - position: relative; - margin-left:80px; -} - -.navbar-search .search-query { - padding-left: 29px; - background-color:#4487D3; - border:1px #0059BE solid; - -webkit-transition:background .5s ease-in-out; - -moz-transition:background .5s ease-in-out; - -ms-transition:background .5s ease-in-out; - -o-transition:background .5s ease-in-out; - transition:background .5s ease-in-out; -} - -.navbar-search .icon-search { - position: absolute; - top: 7px; - left: 11px; - background-image: url("../img/glyphicons-halflings-white.png"); -} - -.navbar-search .search-query:focus, .navbar-search .search-query.focused { - padding-left: 30px; - background-color:#FFFFFF; - text-shadow:none; - color:#333; -} - -.search-query:focus + .icon-search { - background-image: url("../img/glyphicons-halflings.png"); -} - -.navbar .nav i{ - margin-top:1px; -} -.navbar .nav:last-child i{ - margin-top:2px; -} - -.badge-nav{ - top:4px; - background-color:#FFF; - color:#444; - -webkit-border-radius:1px; - -moz-border-radius:1px; - border-radius:1px; - text-shadow:none; -} - - - - - - - -/*--------- SIDEBAR STYLES -------------*/ - -.sideBar{ - padding-top:20px; -} -.sideBar ul{ - list-style:none; - padding:0;margin:0; -} -.sideBar ul > li{ - font-family:"OpenSansLight"; - color:#222; - cursor:pointer; - font-size:16px; - margin-bottom:2px; - -} -.sideBar ul >li figure{ - margin:0; - padding:6px 14px 6px 14px; - opacity:0.7; -} -.sideBar ul > li figure:hover{ - background-color:rgb(249,249,249); - opacity:1; -} -.sideBar ul > li.active figure:first-child{ - color:rgba(0,175,219,1); - background-color:rgb(248,248,248); - opacity:1; -} - -.sideBar ul.subSide{ - padding:5px 0px 5px 0px; - display:none; -} -.sideBar ul.subSide li{ - font-size:15px; - line-height:17px; - margin-bottom:5px; - padding:4px 10px 5px 14px; - margin-left:10px; -} -.sideBar ul.subSide li:hover{ - background-color:rgba(0,175,219,0.1); -} - -.sideBar ul li i{ - margin-top:4px; -} - - -.sideBar ul > li >figure .badge{ - top:-2px; - position:relative; - font-family:"OpenSansRegular"; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - text-shadow:none; - -} - -.sideBottom{ - position:fixed; - z-index:200; - bottom:0;left:20px; - width:183px; - height:auto; - min-height:30px; - background-color:rgb(255,255,255); - border-right:1px rgb(235,235,235) solid; - border-left:1px rgb(235,235,235) solid; -} -.sideBottom .headblue{ -width:inherit; -height:30px; - --webkit-border-radius: 0px; - -moz-border-radius: 0px; - border-radius: 0px; - text-shadow:none; - font-family:"OpenSansRegular"; - -} -.sideBottom .headblue i{ - margin-top:2px; -} - -.sideBottom #tasksSideList li{ - padding:3px 10px 4px 3px; - font-size:12px; - margin:0; - border-bottom:1px rgb(235,235,235) solid; -} -.sideBottom #tasksSideList li a{ - color:#222; - text-decoration:none; -} -.sideBottom #tasksSideList li:last-child{ - border:none; -} -.sideBottom #tasksSideList li:hover{ - background-color:rgb(245,245,245); -} -.sideBottom #tasksSideList li i{ - margin-top:1px; - margin-right:4px; -} - - -/* ------ OTHER STYLES--------------- */ -.borBox{ - -webkit-box-sizing:border-box; - -ms-box-sizing:border-box; - -moz-box-sizing:border-box; - -o-box-sizing:border-box; - box-sizing:border-box; -} -.pad40{ - padding-top:40px; -} -hr{ - margin:7px 0px; -} - - - - -.tooltip{ - font-family:"OpenSansRegular"; -} -.tooltip-inner{ - padding:5px 8px; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - background-color:rgba(0,0,0,0.9); - -} -.tooltip.bottom .tooltip-arrow{ - border-bottom: 5px solid rgba(0,0,0,0.9); -} -.tooltip.top .tooltip-arrow{ - border-top: 5px solid rgba(0,0,0,0.9); -} - - -.content{ - padding:20px; -} - - -.btn-sharp{ - -webkit-border-radius: 0px; - -moz-border-radius: 0px; - border-radius: 0px; -} - -.sharp .btn:first-child{ - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius:1px; -} -.sharp .btn:last-child{ - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius:1px; -} - -.btn-dashboard{ - padding:20px; - height:100px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} - -.tLeft{ - text-align:left; -} -.tRight{ - text-align:right; -} - -.wellDark{ - padding:8px 14px; - background-color:rgba(225,225,225,0.55); - border-radius:2px; - border:1px rgb(210,210,210) solid; -} - - - -/* ------- THE COOLBOX --------------*/ -.coolbox{ - width:100%; - min-height:100%; - height:auto; - -webkit-box-sizing:border-box; - -ms-box-sizing:border-box; - -moz-box-sizing:border-box; - -o-box-sizing:border-box; - box-sizing:border-box; -} -.coolbox .cooltitle{ - width:100%; - height:35px; - padding-top:6px; - font-size:18px; - -webkit-border-radius:0px; - -moz-border-radius:0px; - border-radius:0px; - -webkit-box-sizing:border-box; - -ms-box-sizing:border-box; - -moz-box-sizing:border-box; - -o-box-sizing:border-box; - box-sizing:border-box; -} -.coolbox .cooltitle i{ - margin-top:4px; -} -.coolbox .coolcontent{ - width:100%; - min-height:150px; - height:auto; - padding:20px 10px; - background-color:rgb(255,255,255); - border:1px rgb(225,225,225) solid; - border-top:none; - -webkit-box-sizing:border-box; - -ms-box-sizing:border-box; - -moz-box-sizing:border-box; - -o-box-sizing:border-box; - box-sizing:border-box; -} - - - - -ul.horizontal li{ - display:inline-block; - margin-right:5px; - margin-bottom:5px; -} - - -.control-group label{ - float:left; - display:block; - text-align:left; - width:auto; - padding-top:7px; - margin-right:12px; -} -.control-group .control{ - float:left; - display:block; -} - -::-webkit-scrollbar{width:7px;} -::-webkit-scrollbar-track{background-color:rgba(0,0,0,0.0);} -::-webkit-scrollbar-track:hover{background-color:rgba(0,0,0,0.05);} -::-webkit-scrollbar-thumb{background-color:rgba(0,175,219,0.4);} -::-webkit-scrollbar-thumb:hover{background-color:rgba(0,175,219,0.7);} - - -.green{ - background-color:rgba(0,175,219,1); - height:14px; - width:14px; -} -.mask{ - -webkit-mask-image:url('../img/glyphicons-halflings.png'); - -webkit-mask-position:0 0; - -webkit-mask-repeat:no-repeat; -} - - - -input.sharp{ - -webkit-border-radius:0px; - -moz-border-radius:0px; - border-radius:0px; -} - -.btn.sharp{ - -webkit-border-radius:0px; - -moz-border-radius:0px; - border-radius:0px; -} - - -/* ------ MESSAGES ----------*/ - -.message-item .message-people .pic{ - width:48px; - height:48px; - background-image:url("http://placehold.it/48x48"); - display:block; - float:left; - margin-right:8px; -} -.message-item .message-people .info{ - display:block; - float:left; - margin-top:-3px; -} -.message-item .message-people .info .name{ - color:#333; -} - -.message-item:nth-child(2n){ - background-color:rgb(248,248,248); -} -.message-item{ - padding:10px 10px 0px 10px; -} -.message-item:hover{ - background-color:rgb(244,244,244); -} - -/* ------- TASKS --------*/ -.tasks li a i{ - padding-right:10px; -} - - - -/*----- charts -----*/ - -#mouseDragChart,#timeChart,#bubbleChart,#pieChart,#barChart{ - height:400px; - width:600px; - margin:auto; -} - - -.form.sharp input{ - -webkit-border-radius:0px; - -moz-border-radius:0px; - border-radius:0px; -} -.form.sharp .btn{ - -webkit-border-radius:0px; - -moz-border-radius:0px; - border-radius:0px; -} -.form.vertical input{ - display:block; - clear:both; - -} -.form.vertical h6{ - margin-top:-5px; - margin-bottom:6px; -} -.form.vertical .btn,.form.vertical a{ - display:block; - clear:both; - margin-top:0; - margin-bottom:20px; -} -.form.vertical .span4{ - margin-left:0; -} - -button.sp{ - margin-bottom:20px; - - clear:both; -} - -.noFM{ - margin-left:0 !important; - padding-left:0; + +/*------------- FONTS --------------------------------------------------------------------------------- */ +/* Generated by Font Squirrel (http://www.fontsquirrel.com)*/ + +@font-face { + font-family: 'OpenSansLight'; + src: url('../fonts/OpenSans-Light-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + +} + +@font-face { + font-family: 'OpenSansRegular'; + src: url('../fonts/OpenSans-Regular-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + +} + +@font-face { + font-family: 'OpenSansSemibold'; + src: url('../fonts/OpenSans-Semibold-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + +} + +@font-face { + font-family: 'OpenSansBold'; + src: url('../fonts/OpenSans-Bold-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + +} + + + +body{ + background-color:rgb(255,255,255); + background-image:url("../img/colbg.jpg"); + background-repeat:repeat-x; + background-position:0px 40px; + overflow-y:auto; +} +body#landingBody{ + background-position:0px 0px; +} + +.navbar .brand i{ + margin-top:5px; +} +.navbar .brand{ + color:rgb(255,255,255); + + -webkit-transition:color .2s ease-in-out; + cursor:pointer; +} +.navbar .brand:hover{ + color:rgba(0,215,249,1); +} + +.navbar .nav a:hover{ + -webkit-transition:color .3s ease-in-out; +} + +.navbar .navbar-inner{ + box-shadow:none; +} + +.navbar.blacktrans .navbar-inner{ +background: -moz-linear-gradient(top, rgba(51,51,51,0.8) 0%, rgba(34,34,34,0.85) 100%); /* FF3.6+ */ +background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(51,51,51,0.8)), color-stop(100%,rgba(34,34,34,0.85))); /* Chrome,Safari4+ */ +background: -webkit-linear-gradient(top, rgba(51,51,51,0.8) 0%,rgba(34,34,34,0.85) 100%); /* Chrome10+,Safari5.1+ */ +background: -o-linear-gradient(top, rgba(51,51,51,0.8) 0%,rgba(34,34,34,0.85) 100%); /* Opera 11.10+ */ +background: -ms-linear-gradient(top, rgba(51,51,51,0.8) 0%,rgba(34,34,34,0.85) 100%); /* IE10+ */ +background: linear-gradient(top, rgba(51,51,51,0.8) 0%,rgba(34,34,34,0.85) 100%); /* W3C */ +filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cc333333', endColorstr='#d9222222',GradientType=0 ); /* IE6-9 */ + +} +.navbar.blue .navbar-inner{ +background: -moz-linear-gradient(top, rgba(9,86,174,0.8) 0%, rgba(2,74,158,0.85) 100%); /* FF3.6+ */ +background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(9,86,174,0.8)), color-stop(100%,rgba(2,74,158,0.85))); /* Chrome,Safari4+ */ +background: -webkit-linear-gradient(top, rgba(9,86,174,0.8) 0%,rgba(2,74,158,0.85) 100%); /* Chrome10+,Safari5.1+ */ +background: -o-linear-gradient(top, rgba(9,86,174,0.8) 0%,rgba(2,74,158,0.85) 100%); /* Opera 11.10+ */ +background: -ms-linear-gradient(top, rgba(9,86,174,0.8) 0%,rgba(2,74,158,0.85) 100%); /* IE10+ */ +background: linear-gradient(top, rgba(9,86,174,0.8) 0%,rgba(2,74,158,0.85) 100%); /* W3C */ +filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cc0956ae', endColorstr='#d9024a9e',GradientType=0 ); /* IE6-9 */ +} + +.navbar.blue2 .navbar-inner{ + background: #0956ae; +background: -moz-linear-gradient(top, #0956ae 0%, #024a9e 100%); +background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0956ae), color-stop(100%,#024a9e)); +background: -webkit-linear-gradient(top, #0956ae 0%,#024a9e 100%); +background: -o-linear-gradient(top, #0956ae 0%,#024a9e 100%); +background: -ms-linear-gradient(top, #0956ae 0%,#024a9e 100%); +background: linear-gradient(top, #0956ae 0%,#024a9e 100%); +filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0956ae', endColorstr='#024a9e',GradientType=0 ); + +} +.navbar.blue .nav > li > a{ + color:rgb(255,255,255); + opacity:0.8; + -webkit-transition:opacity .3s ease-in-out; +} +.navbar.blue .nav > li > a:hover{ + opacity:1; +} +.navbar.blue .nav > .active > a{ + opacity:1; + background-color:rgba(0,0,0,0.2); +} + +.navbar-search { + position: relative; + margin-left:80px; +} + +.navbar-search .search-query { + padding-left: 29px; + background-color:#4487D3; + border:1px #0059BE solid; + -webkit-transition:background .5s ease-in-out; + -moz-transition:background .5s ease-in-out; + -ms-transition:background .5s ease-in-out; + -o-transition:background .5s ease-in-out; + transition:background .5s ease-in-out; +} + +.navbar-search .icon-search { + position: absolute; + top: 7px; + left: 11px; + background-image: url("../img/glyphicons-halflings-white.png"); +} + +.navbar-search .search-query:focus, .navbar-search .search-query.focused { + padding-left: 30px; + background-color:#FFFFFF; + text-shadow:none; + color:#333; +} + +.search-query:focus + .icon-search { + background-image: url("../img/glyphicons-halflings.png"); +} + +.navbar .nav i{ + margin-top:1px; +} +.navbar .nav:last-child i{ + margin-top:2px; +} + +.badge-nav{ + top:4px; + background-color:#FFF; + color:#444; + -webkit-border-radius:1px; + -moz-border-radius:1px; + border-radius:1px; + text-shadow:none; +} + + + + + + + +/*--------- SIDEBAR STYLES -------------*/ + +.sideBar{ + padding-top:20px; +} +.sideBar ul{ + list-style:none; + padding:0;margin:0; +} +.sideBar ul > li{ + font-family:"OpenSansLight"; + color:#222; + cursor:pointer; + font-size:16px; + margin-bottom:2px; + +} +.sideBar ul >li figure{ + margin:0; + padding:6px 14px 6px 14px; + opacity:0.7; +} +.sideBar ul > li figure:hover{ + background-color:rgb(249,249,249); + opacity:1; +} +.sideBar ul > li.active figure:first-child{ + color:rgba(0,175,219,1); + background-color:rgb(248,248,248); + opacity:1; +} + +.sideBar ul.subSide{ + padding:5px 0px 5px 0px; + display:none; +} +.sideBar ul.subSide li{ + font-size:15px; + line-height:17px; + margin-bottom:5px; + padding:4px 10px 5px 14px; + margin-left:10px; +} +.sideBar ul.subSide li:hover{ + background-color:rgba(0,175,219,0.1); +} + +.sideBar ul li i{ + margin-top:4px; +} + + +.sideBar ul > li >figure .badge{ + top:-2px; + position:relative; + font-family:"OpenSansRegular"; + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; + text-shadow:none; + +} + +.sideBottom{ + position:fixed; + z-index:200; + bottom:0;left:20px; + width:183px; + height:auto; + min-height:30px; + background-color:rgb(255,255,255); + border-right:1px rgb(235,235,235) solid; + border-left:1px rgb(235,235,235) solid; +} +.sideBottom .headblue{ +width:inherit; +height:30px; + +-webkit-border-radius: 0px; + -moz-border-radius: 0px; + border-radius: 0px; + text-shadow:none; + font-family:"OpenSansRegular"; + +} +.sideBottom .headblue i{ + margin-top:2px; +} + +.sideBottom #tasksSideList li{ + padding:3px 10px 4px 3px; + font-size:12px; + margin:0; + border-bottom:1px rgb(235,235,235) solid; +} +.sideBottom #tasksSideList li a{ + color:#222; + text-decoration:none; +} +.sideBottom #tasksSideList li:last-child{ + border:none; +} +.sideBottom #tasksSideList li:hover{ + background-color:rgb(245,245,245); +} +.sideBottom #tasksSideList li i{ + margin-top:1px; + margin-right:4px; +} + + +/* ------ OTHER STYLES--------------- */ +.borBox{ + -webkit-box-sizing:border-box; + -ms-box-sizing:border-box; + -moz-box-sizing:border-box; + -o-box-sizing:border-box; + box-sizing:border-box; +} +.pad40{ + padding-top:40px; +} +hr{ + margin:7px 0px; +} + + + + +.tooltip{ + font-family:"OpenSansRegular"; +} +.tooltip-inner{ + padding:5px 8px; + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; + background-color:rgba(0,0,0,0.9); + +} +.tooltip.bottom .tooltip-arrow{ + border-bottom: 5px solid rgba(0,0,0,0.9); +} +.tooltip.top .tooltip-arrow{ + border-top: 5px solid rgba(0,0,0,0.9); +} + + +.content{ + padding:20px; +} + + +.btn-sharp{ + -webkit-border-radius: 0px; + -moz-border-radius: 0px; + border-radius: 0px; +} + +.sharp .btn:first-child{ + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + border-radius:1px; +} +.sharp .btn:last-child{ + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + border-radius:1px; +} + +.btn-dashboard{ + padding:20px; + height:100px; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} + +.tLeft{ + text-align:left; +} +.tRight{ + text-align:right; +} + +.wellDark{ + padding:8px 14px; + background-color:rgba(225,225,225,0.55); + border-radius:2px; + border:1px rgb(210,210,210) solid; +} + + + +/* ------- THE COOLBOX --------------*/ +.coolbox{ + width:100%; + min-height:100%; + height:auto; + -webkit-box-sizing:border-box; + -ms-box-sizing:border-box; + -moz-box-sizing:border-box; + -o-box-sizing:border-box; + box-sizing:border-box; +} +.coolbox .cooltitle{ + width:100%; + height:35px; + padding-top:6px; + font-size:18px; + -webkit-border-radius:0px; + -moz-border-radius:0px; + border-radius:0px; + -webkit-box-sizing:border-box; + -ms-box-sizing:border-box; + -moz-box-sizing:border-box; + -o-box-sizing:border-box; + box-sizing:border-box; +} +.coolbox .cooltitle i{ + margin-top:4px; +} +.coolbox .coolcontent{ + width:100%; + min-height:150px; + height:auto; + padding:20px 10px; + background-color:rgb(255,255,255); + border:1px rgb(225,225,225) solid; + border-top:none; + -webkit-box-sizing:border-box; + -ms-box-sizing:border-box; + -moz-box-sizing:border-box; + -o-box-sizing:border-box; + box-sizing:border-box; +} + + + + +ul.horizontal li{ + display:inline-block; + margin-right:5px; + margin-bottom:5px; +} + + +.control-group label{ + float:left; + display:block; + text-align:left; + width:auto; + padding-top:7px; + margin-right:12px; +} +.control-group .control{ + float:left; + display:block; +} + +::-webkit-scrollbar{width:7px;} +::-webkit-scrollbar-track{background-color:rgba(0,0,0,0.0);} +::-webkit-scrollbar-track:hover{background-color:rgba(0,0,0,0.05);} +::-webkit-scrollbar-thumb{background-color:rgba(0,175,219,0.4);} +::-webkit-scrollbar-thumb:hover{background-color:rgba(0,175,219,0.7);} + + +.green{ + background-color:rgba(0,175,219,1); + height:14px; + width:14px; +} +.mask{ + -webkit-mask-image:url('../img/glyphicons-halflings.png'); + -webkit-mask-position:0 0; + -webkit-mask-repeat:no-repeat; +} + + + +input.sharp{ + -webkit-border-radius:0px; + -moz-border-radius:0px; + border-radius:0px; +} + +.btn.sharp{ + -webkit-border-radius:0px; + -moz-border-radius:0px; + border-radius:0px; +} + + +/* ------ MESSAGES ----------*/ + +.message-item .message-people .pic{ + width:48px; + height:48px; + background-image:url("http://placehold.it/48x48"); + display:block; + float:left; + margin-right:8px; +} +.message-item .message-people .info{ + display:block; + float:left; + margin-top:-3px; +} +.message-item .message-people .info .name{ + color:#333; +} + +.message-item:nth-child(2n){ + background-color:rgb(248,248,248); +} +.message-item{ + padding:10px 10px 0px 10px; +} +.message-item:hover{ + background-color:rgb(244,244,244); +} + +/* ------- TASKS --------*/ +.tasks li a i{ + padding-right:10px; +} + + + +/*----- charts -----*/ + +#mouseDragChart,#timeChart,#bubbleChart,#pieChart,#barChart{ + height:400px; + width:600px; + margin:auto; +} + + +.form.sharp input{ + -webkit-border-radius:0px; + -moz-border-radius:0px; + border-radius:0px; +} +.form.sharp .btn{ + -webkit-border-radius:0px; + -moz-border-radius:0px; + border-radius:0px; +} +.form.vertical input{ + display:block; + clear:both; + +} +.form.vertical h6{ + margin-top:-5px; + margin-bottom:6px; +} +.form.vertical .btn,.form.vertical a{ + display:block; + clear:both; + margin-top:0; + margin-bottom:20px; +} +.form.vertical .span4{ + margin-left:0; +} + +button.sp{ + margin-bottom:20px; + + clear:both; +} + +.noFM{ + margin-left:0 !important; + padding-left:0; } \ No newline at end of file diff --git a/WebContent/css/styles.css b/src/main/webapp/css/styles.css similarity index 95% rename from WebContent/css/styles.css rename to src/main/webapp/css/styles.css index 3b2fc90..60dc00e 100644 --- a/WebContent/css/styles.css +++ b/src/main/webapp/css/styles.css @@ -1,243 +1,243 @@ -@import url(http://fonts.useso.com/css?family=Source+Sans+Pro:200,300); -* { - box-sizing: border-box; - margin: 0; - padding: 0; - font-weight: 300; -} -body { - font-family: 'Source Sans Pro', sans-serif; - color: white; - font-weight: 300; -} -body ::-webkit-input-placeholder { - /* WebKit browsers */ - font-family: 'Source Sans Pro', sans-serif; - color: white; - font-weight: 300; -} -body :-moz-placeholder { - /* Mozilla Firefox 4 to 18 */ - font-family: 'Source Sans Pro', sans-serif; - color: white; - opacity: 1; - font-weight: 300; -} -body ::-moz-placeholder { - /* Mozilla Firefox 19+ */ - font-family: 'Source Sans Pro', sans-serif; - color: white; - opacity: 1; - font-weight: 300; -} -body :-ms-input-placeholder { - /* Internet Explorer 10+ */ - font-family: 'Source Sans Pro', sans-serif; - color: white; - font-weight: 300; -} -form label.error { - width: 200px; - margin-left: 8px; - color: Red; -} -.wrapper { - background: #50a3a2; - background: -webkit-linear-gradient(top left, #50a3a2 0%, #53e3a6 100%); - background: linear-gradient(to bottom right, #50a3a2 0%, #53e3a6 100%); - opacity: 0.8; - position: absolute; - top: 50%; - left: 0; - width: 100%; - height: 400px; - margin-top: -200px; - overflow: hidden; - -} - -.wrapper.form-success .container h1 { - -webkit-transform: translateY(85px); - -ms-transform: translateY(85px); - transform: translateY(85px); -} -.container { - max-width: 600px; - margin: 0 auto; - padding: 80px 0; - height: 400px; - text-align: center; -} -.container h1 { - font-size: 40px; - -webkit-transition-duration: 1s; - transition-duration: 1s; - -webkit-transition-timing-function: ease-in-put; - transition-timing-function: ease-in-put; - font-weight: 200; -} -form { - padding: 20px 0; - position: relative; - z-index: 2; -} -form input[type="text"], -form input[type="password"] { - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - outline: 0; - border: 1px solid rgba(255, 255, 255, 0.4); - background-color: rgba(255, 255, 255, 0.2); - width: 250px; - border-radius: 3px; - padding: 10px 15px; - margin: 0 auto 10px auto; - display: block; - text-align: center; - font-size: 18px; - color: white; - -webkit-transition-duration: 0.25s; - transition-duration: 0.25s; - font-weight: 300; -} -form input[type="text"]:hover, -form input[type="password"]:hover - { - background-color: rgba(255, 255, 255, 0.4); -} -form input[type="text"]:focus, -form input[type="password"]:focus { - background-color: white; - width: 300px; - color: #53e3a6; -} -form button { - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - outline: 0; - background-color: white; - border: 0; - padding: 10px 15px; - color: #53e3a6; - border-radius: 3px; - width: 250px; - cursor: pointer; - font-size: 18px; - -webkit-transition-duration: 0.25s; - transition-duration: 0.25s; -} -form button:hover { - background-color: #f5f7f9; -} -.bg-bubbles { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 1; -} -.bg-bubbles li { - position: absolute; - list-style: none; - display: block; - width: 40px; - height: 40px; - background-color: rgba(255, 255, 255, 0.15); - bottom: -160px; - -webkit-animation: square 25s infinite; - animation: square 25s infinite; - -webkit-transition-timing-function: linear; - transition-timing-function: linear; -} -.bg-bubbles li:nth-child(1) { - left: 10%; -} -.bg-bubbles li:nth-child(2) { - left: 20%; - width: 80px; - height: 80px; - -webkit-animation-delay: 2s; - animation-delay: 2s; - -webkit-animation-duration: 17s; - animation-duration: 17s; -} -.bg-bubbles li:nth-child(3) { - left: 25%; - -webkit-animation-delay: 4s; - animation-delay: 4s; -} -.bg-bubbles li:nth-child(4) { - left: 40%; - width: 60px; - height: 60px; - -webkit-animation-duration: 22s; - animation-duration: 22s; - background-color: rgba(255, 255, 255, 0.25); -} -.bg-bubbles li:nth-child(5) { - left: 70%; -} -.bg-bubbles li:nth-child(6) { - left: 80%; - width: 120px; - height: 120px; - -webkit-animation-delay: 3s; - animation-delay: 3s; - background-color: rgba(255, 255, 255, 0.2); -} -.bg-bubbles li:nth-child(7) { - left: 32%; - width: 160px; - height: 160px; - -webkit-animation-delay: 7s; - animation-delay: 7s; -} -.bg-bubbles li:nth-child(8) { - left: 55%; - width: 20px; - height: 20px; - -webkit-animation-delay: 15s; - animation-delay: 15s; - -webkit-animation-duration: 40s; - animation-duration: 40s; -} -.bg-bubbles li:nth-child(9) { - left: 25%; - width: 10px; - height: 10px; - -webkit-animation-delay: 2s; - animation-delay: 2s; - -webkit-animation-duration: 40s; - animation-duration: 40s; - background-color: rgba(255, 255, 255, 0.3); -} -.bg-bubbles li:nth-child(10) { - left: 90%; - width: 160px; - height: 160px; - -webkit-animation-delay: 11s; - animation-delay: 11s; -} -@-webkit-keyframes square { - 0% { - -webkit-transform: translateY(0); - transform: translateY(0); - } - 100% { - -webkit-transform: translateY(-700px) rotate(600deg); - transform: translateY(-700px) rotate(600deg); - } -} -@keyframes square { - 0% { - -webkit-transform: translateY(0); - transform: translateY(0); - } - 100% { - -webkit-transform: translateY(-700px) rotate(600deg); - transform: translateY(-700px) rotate(600deg); - } +@import url(http://fonts.useso.com/css?family=Source+Sans+Pro:200,300); +* { + box-sizing: border-box; + margin: 0; + padding: 0; + font-weight: 300; +} +body { + font-family: 'Source Sans Pro', sans-serif; + color: white; + font-weight: 300; +} +body ::-webkit-input-placeholder { + /* WebKit browsers */ + font-family: 'Source Sans Pro', sans-serif; + color: white; + font-weight: 300; +} +body :-moz-placeholder { + /* Mozilla Firefox 4 to 18 */ + font-family: 'Source Sans Pro', sans-serif; + color: white; + opacity: 1; + font-weight: 300; +} +body ::-moz-placeholder { + /* Mozilla Firefox 19+ */ + font-family: 'Source Sans Pro', sans-serif; + color: white; + opacity: 1; + font-weight: 300; +} +body :-ms-input-placeholder { + /* Internet Explorer 10+ */ + font-family: 'Source Sans Pro', sans-serif; + color: white; + font-weight: 300; +} +form label.error { + width: 200px; + margin-left: 8px; + color: Red; +} +.wrapper { + background: #50a3a2; + background: -webkit-linear-gradient(top left, #50a3a2 0%, #53e3a6 100%); + background: linear-gradient(to bottom right, #50a3a2 0%, #53e3a6 100%); + opacity: 0.8; + position: absolute; + top: 50%; + left: 0; + width: 100%; + height: 400px; + margin-top: -200px; + overflow: hidden; + +} + +.wrapper.form-success .container h1 { + -webkit-transform: translateY(85px); + -ms-transform: translateY(85px); + transform: translateY(85px); +} +.container { + max-width: 600px; + margin: 0 auto; + padding: 80px 0; + height: 400px; + text-align: center; +} +.container h1 { + font-size: 40px; + -webkit-transition-duration: 1s; + transition-duration: 1s; + -webkit-transition-timing-function: ease-in-put; + transition-timing-function: ease-in-put; + font-weight: 200; +} +form { + padding: 20px 0; + position: relative; + z-index: 2; +} +form input[type="text"], +form input[type="password"] { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + outline: 0; + border: 1px solid rgba(255, 255, 255, 0.4); + background-color: rgba(255, 255, 255, 0.2); + width: 250px; + border-radius: 3px; + padding: 10px 15px; + margin: 0 auto 10px auto; + display: block; + text-align: center; + font-size: 18px; + color: white; + -webkit-transition-duration: 0.25s; + transition-duration: 0.25s; + font-weight: 300; +} +form input[type="text"]:hover, +form input[type="password"]:hover + { + background-color: rgba(255, 255, 255, 0.4); +} +form input[type="text"]:focus, +form input[type="password"]:focus { + background-color: white; + width: 300px; + color: #53e3a6; +} +form button { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + outline: 0; + background-color: white; + border: 0; + padding: 10px 15px; + color: #53e3a6; + border-radius: 3px; + width: 250px; + cursor: pointer; + font-size: 18px; + -webkit-transition-duration: 0.25s; + transition-duration: 0.25s; +} +form button:hover { + background-color: #f5f7f9; +} +.bg-bubbles { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 1; +} +.bg-bubbles li { + position: absolute; + list-style: none; + display: block; + width: 40px; + height: 40px; + background-color: rgba(255, 255, 255, 0.15); + bottom: -160px; + -webkit-animation: square 25s infinite; + animation: square 25s infinite; + -webkit-transition-timing-function: linear; + transition-timing-function: linear; +} +.bg-bubbles li:nth-child(1) { + left: 10%; +} +.bg-bubbles li:nth-child(2) { + left: 20%; + width: 80px; + height: 80px; + -webkit-animation-delay: 2s; + animation-delay: 2s; + -webkit-animation-duration: 17s; + animation-duration: 17s; +} +.bg-bubbles li:nth-child(3) { + left: 25%; + -webkit-animation-delay: 4s; + animation-delay: 4s; +} +.bg-bubbles li:nth-child(4) { + left: 40%; + width: 60px; + height: 60px; + -webkit-animation-duration: 22s; + animation-duration: 22s; + background-color: rgba(255, 255, 255, 0.25); +} +.bg-bubbles li:nth-child(5) { + left: 70%; +} +.bg-bubbles li:nth-child(6) { + left: 80%; + width: 120px; + height: 120px; + -webkit-animation-delay: 3s; + animation-delay: 3s; + background-color: rgba(255, 255, 255, 0.2); +} +.bg-bubbles li:nth-child(7) { + left: 32%; + width: 160px; + height: 160px; + -webkit-animation-delay: 7s; + animation-delay: 7s; +} +.bg-bubbles li:nth-child(8) { + left: 55%; + width: 20px; + height: 20px; + -webkit-animation-delay: 15s; + animation-delay: 15s; + -webkit-animation-duration: 40s; + animation-duration: 40s; +} +.bg-bubbles li:nth-child(9) { + left: 25%; + width: 10px; + height: 10px; + -webkit-animation-delay: 2s; + animation-delay: 2s; + -webkit-animation-duration: 40s; + animation-duration: 40s; + background-color: rgba(255, 255, 255, 0.3); +} +.bg-bubbles li:nth-child(10) { + left: 90%; + width: 160px; + height: 160px; + -webkit-animation-delay: 11s; + animation-delay: 11s; +} +@-webkit-keyframes square { + 0% { + -webkit-transform: translateY(0); + transform: translateY(0); + } + 100% { + -webkit-transform: translateY(-700px) rotate(600deg); + transform: translateY(-700px) rotate(600deg); + } +} +@keyframes square { + 0% { + -webkit-transform: translateY(0); + transform: translateY(0); + } + 100% { + -webkit-transform: translateY(-700px) rotate(600deg); + transform: translateY(-700px) rotate(600deg); + } } \ No newline at end of file diff --git a/WebContent/fonts/OpenSans-Light-webfont.ttf b/src/main/webapp/fonts/OpenSans-Light-webfont.ttf similarity index 100% rename from WebContent/fonts/OpenSans-Light-webfont.ttf rename to src/main/webapp/fonts/OpenSans-Light-webfont.ttf diff --git a/WebContent/fonts/OpenSans-Regular-webfont.ttf b/src/main/webapp/fonts/OpenSans-Regular-webfont.ttf similarity index 100% rename from WebContent/fonts/OpenSans-Regular-webfont.ttf rename to src/main/webapp/fonts/OpenSans-Regular-webfont.ttf diff --git a/WebContent/fonts/icomoon.ttf b/src/main/webapp/fonts/icomoon.ttf similarity index 100% rename from WebContent/fonts/icomoon.ttf rename to src/main/webapp/fonts/icomoon.ttf diff --git a/WebContent/fonts/icomoon.woff b/src/main/webapp/fonts/icomoon.woff similarity index 100% rename from WebContent/fonts/icomoon.woff rename to src/main/webapp/fonts/icomoon.woff diff --git a/WebContent/js/bootstrap.min.js b/src/main/webapp/js/bootstrap.min.js similarity index 100% rename from WebContent/js/bootstrap.min.js rename to src/main/webapp/js/bootstrap.min.js diff --git a/WebContent/js/dataTables.bootstrap.min.js b/src/main/webapp/js/dataTables.bootstrap.min.js similarity index 100% rename from WebContent/js/dataTables.bootstrap.min.js rename to src/main/webapp/js/dataTables.bootstrap.min.js diff --git a/WebContent/js/jquery-1.8.3.min.js b/src/main/webapp/js/jquery-1.8.3.min.js similarity index 100% rename from WebContent/js/jquery-1.8.3.min.js rename to src/main/webapp/js/jquery-1.8.3.min.js diff --git a/WebContent/js/jquery-2.1.1.min.js b/src/main/webapp/js/jquery-2.1.1.min.js similarity index 99% rename from WebContent/js/jquery-2.1.1.min.js rename to src/main/webapp/js/jquery-2.1.1.min.js index 181c65e..c4643af 100644 --- a/WebContent/js/jquery-2.1.1.min.js +++ b/src/main/webapp/js/jquery-2.1.1.min.js @@ -1,5 +1,5 @@ -/*! jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ -!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.1",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="
",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+Math.random()}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b) -},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthx",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*\s*$/g,ib={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("':""), +/*! + * jQuery UI 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI + */(function(a,b){function d(b){return!a(b).parents().andSelf().filter(function(){return a.curCSS(this,"visibility")==="hidden"||a.expr.filters.hidden(this)}).length}function c(b,c){var e=b.nodeName.toLowerCase();if("area"===e){var f=b.parentNode,g=f.name,h;if(!b.href||!g||f.nodeName.toLowerCase()!=="map")return!1;h=a("img[usemap=#"+g+"]")[0];return!!h&&d(h)}return(/input|select|textarea|button|object/.test(e)?!b.disabled:"a"==e?b.href||c:c)&&d(b)}a.ui=a.ui||{};a.ui.version||(a.extend(a.ui,{version:"1.8.18",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}}),a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus:a.fn.focus,focus:function(b,c){return typeof b=="number"?this.each(function(){var d=this;setTimeout(function(){a(d).focus(),c&&c.call(d)},b)}):this._focus.apply(this,arguments)},scrollParent:function(){var b;a.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?b=this.parents().filter(function(){return/(relative|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0):b=this.parents().filter(function(){return/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!b.length?a(document):b},zIndex:function(c){if(c!==b)return this.css("zIndex",c);if(this.length){var d=a(this[0]),e,f;while(d.length&&d[0]!==document){e=d.css("position");if(e==="absolute"||e==="relative"||e==="fixed"){f=parseInt(d.css("zIndex"),10);if(!isNaN(f)&&f!==0)return f}d=d.parent()}}return 0},disableSelection:function(){return this.bind((a.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),a.each(["Width","Height"],function(c,d){function h(b,c,d,f){a.each(e,function(){c-=parseFloat(a.curCSS(b,"padding"+this,!0))||0,d&&(c-=parseFloat(a.curCSS(b,"border"+this+"Width",!0))||0),f&&(c-=parseFloat(a.curCSS(b,"margin"+this,!0))||0)});return c}var e=d==="Width"?["Left","Right"]:["Top","Bottom"],f=d.toLowerCase(),g={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.fn["inner"+d]=function(c){if(c===b)return g["inner"+d].call(this);return this.each(function(){a(this).css(f,h(this,c)+"px")})},a.fn["outer"+d]=function(b,c){if(typeof b!="number")return g["outer"+d].call(this,b);return this.each(function(){a(this).css(f,h(this,b,!0,c)+"px")})}}),a.extend(a.expr[":"],{data:function(b,c,d){return!!a.data(b,d[3])},focusable:function(b){return c(b,!isNaN(a.attr(b,"tabindex")))},tabbable:function(b){var d=a.attr(b,"tabindex"),e=isNaN(d);return(e||d>=0)&&c(b,!e)}}),a(function(){var b=document.body,c=b.appendChild(c=document.createElement("div"));c.offsetHeight,a.extend(c.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0}),a.support.minHeight=c.offsetHeight===100,a.support.selectstart="onselectstart"in c,b.removeChild(c).style.display="none"}),a.extend(a.ui,{plugin:{add:function(b,c,d){var e=a.ui[b].prototype;for(var f in d)e.plugins[f]=e.plugins[f]||[],e.plugins[f].push([c,d[f]])},call:function(a,b,c){var d=a.plugins[b];if(!!d&&!!a.element[0].parentNode)for(var e=0;e0)return!0;b[d]=1,e=b[d]>0,b[d]=0;return e},isOverAxis:function(a,b,c){return a>b&&a=9)&&!b.button)return this._mouseUp(b);if(this._mouseStarted){this._mouseDrag(b);return b.preventDefault()}this._mouseDistanceMet(b)&&this._mouseDelayMet(b)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,b)!==!1,this._mouseStarted?this._mouseDrag(b):this._mouseUp(b));return!this._mouseStarted},_mouseUp:function(b){a(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,b.target==this._mouseDownEvent.target&&a.data(b.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(b));return!1},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(a){return this.mouseDelayMet},_mouseStart:function(a){},_mouseDrag:function(a){},_mouseStop:function(a){},_mouseCapture:function(a){return!0}})})(jQuery);/* + * jQuery UI Position 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Position + */(function(a,b){a.ui=a.ui||{};var c=/left|center|right/,d=/top|center|bottom/,e="center",f={},g=a.fn.position,h=a.fn.offset;a.fn.position=function(b){if(!b||!b.of)return g.apply(this,arguments);b=a.extend({},b);var h=a(b.of),i=h[0],j=(b.collision||"flip").split(" "),k=b.offset?b.offset.split(" "):[0,0],l,m,n;i.nodeType===9?(l=h.width(),m=h.height(),n={top:0,left:0}):i.setTimeout?(l=h.width(),m=h.height(),n={top:h.scrollTop(),left:h.scrollLeft()}):i.preventDefault?(b.at="left top",l=m=0,n={top:b.of.pageY,left:b.of.pageX}):(l=h.outerWidth(),m=h.outerHeight(),n=h.offset()),a.each(["my","at"],function(){var a=(b[this]||"").split(" ");a.length===1&&(a=c.test(a[0])?a.concat([e]):d.test(a[0])?[e].concat(a):[e,e]),a[0]=c.test(a[0])?a[0]:e,a[1]=d.test(a[1])?a[1]:e,b[this]=a}),j.length===1&&(j[1]=j[0]),k[0]=parseInt(k[0],10)||0,k.length===1&&(k[1]=k[0]),k[1]=parseInt(k[1],10)||0,b.at[0]==="right"?n.left+=l:b.at[0]===e&&(n.left+=l/2),b.at[1]==="bottom"?n.top+=m:b.at[1]===e&&(n.top+=m/2),n.left+=k[0],n.top+=k[1];return this.each(function(){var c=a(this),d=c.outerWidth(),g=c.outerHeight(),h=parseInt(a.curCSS(this,"marginLeft",!0))||0,i=parseInt(a.curCSS(this,"marginTop",!0))||0,o=d+h+(parseInt(a.curCSS(this,"marginRight",!0))||0),p=g+i+(parseInt(a.curCSS(this,"marginBottom",!0))||0),q=a.extend({},n),r;b.my[0]==="right"?q.left-=d:b.my[0]===e&&(q.left-=d/2),b.my[1]==="bottom"?q.top-=g:b.my[1]===e&&(q.top-=g/2),f.fractions||(q.left=Math.round(q.left),q.top=Math.round(q.top)),r={left:q.left-h,top:q.top-i},a.each(["left","top"],function(c,e){a.ui.position[j[c]]&&a.ui.position[j[c]][e](q,{targetWidth:l,targetHeight:m,elemWidth:d,elemHeight:g,collisionPosition:r,collisionWidth:o,collisionHeight:p,offset:k,my:b.my,at:b.at})}),a.fn.bgiframe&&c.bgiframe(),c.offset(a.extend(q,{using:b.using}))})},a.ui.position={fit:{left:function(b,c){var d=a(window),e=c.collisionPosition.left+c.collisionWidth-d.width()-d.scrollLeft();b.left=e>0?b.left-e:Math.max(b.left-c.collisionPosition.left,b.left)},top:function(b,c){var d=a(window),e=c.collisionPosition.top+c.collisionHeight-d.height()-d.scrollTop();b.top=e>0?b.top-e:Math.max(b.top-c.collisionPosition.top,b.top)}},flip:{left:function(b,c){if(c.at[0]!==e){var d=a(window),f=c.collisionPosition.left+c.collisionWidth-d.width()-d.scrollLeft(),g=c.my[0]==="left"?-c.elemWidth:c.my[0]==="right"?c.elemWidth:0,h=c.at[0]==="left"?c.targetWidth:-c.targetWidth,i=-2*c.offset[0];b.left+=c.collisionPosition.left<0?g+h+i:f>0?g+h+i:0}},top:function(b,c){if(c.at[1]!==e){var d=a(window),f=c.collisionPosition.top+c.collisionHeight-d.height()-d.scrollTop(),g=c.my[1]==="top"?-c.elemHeight:c.my[1]==="bottom"?c.elemHeight:0,h=c.at[1]==="top"?c.targetHeight:-c.targetHeight,i=-2*c.offset[1];b.top+=c.collisionPosition.top<0?g+h+i:f>0?g+h+i:0}}}},a.offset.setOffset||(a.offset.setOffset=function(b,c){/static/.test(a.curCSS(b,"position"))&&(b.style.position="relative");var d=a(b),e=d.offset(),f=parseInt(a.curCSS(b,"top",!0),10)||0,g=parseInt(a.curCSS(b,"left",!0),10)||0,h={top:c.top-e.top+f,left:c.left-e.left+g};"using"in c?c.using.call(b,h):d.css(h)},a.fn.offset=function(b){var c=this[0];if(!c||!c.ownerDocument)return null;if(b)return this.each(function(){a.offset.setOffset(this,b)});return h.call(this)}),function(){var b=document.getElementsByTagName("body")[0],c=document.createElement("div"),d,e,g,h,i;d=document.createElement(b?"div":"body"),g={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},b&&a.extend(g,{position:"absolute",left:"-1000px",top:"-1000px"});for(var j in g)d.style[j]=g[j];d.appendChild(c),e=b||document.documentElement,e.insertBefore(d,e.firstChild),c.style.cssText="position: absolute; left: 10.7432222px; top: 10.432325px; height: 30px; width: 201px;",h=a(c).offset(function(a,b){return b}).offset(),d.innerHTML="",e.removeChild(d),i=h.top+h.left+(b?2e3:0),f.fractions=i>21&&i<22}()})(jQuery);/* + * jQuery UI Datepicker 1.8.18 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Datepicker + * + * Depends: + * jquery.ui.core.js + */(function($,undefined){function isArray(a){return a&&($.browser.safari&&typeof a=="object"&&a.length||a.constructor&&a.constructor.toString().match(/\Array\(\)/))}function extendRemove(a,b){$.extend(a,b);for(var c in b)if(b[c]==null||b[c]==undefined)a[c]=b[c];return a}function bindHover(a){var b="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return a.bind("mouseout",function(a){var c=$(a.target).closest(b);!c.length||c.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(c){var d=$(c.target).closest(b);!$.datepicker._isDisabledDatepicker(instActive.inline?a.parent()[0]:instActive.input[0])&&!!d.length&&(d.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),d.addClass("ui-state-hover"),d.hasClass("ui-datepicker-prev")&&d.addClass("ui-datepicker-prev-hover"),d.hasClass("ui-datepicker-next")&&d.addClass("ui-datepicker-next-hover"))})}function Datepicker(){this.debug=!1,this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],monthNamesShort:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],dayNames:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],dayNamesShort:["日","一","二","三","四","五","六"],dayNamesMin:["日","一","二","三","四","五","六"],weekHeader:"周",dateFormat:"yy-mm-dd",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:1,changeYear:1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},$.extend(this._defaults,this.regional[""]),this.dpDiv=bindHover($('
'))}$.extend($.ui,{datepicker:{version:"1.8.18"}});var PROP_NAME="datepicker",dpuuid=(new Date).getTime(),instActive;$.extend(Datepicker.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){extendRemove(this._defaults,a||{});return this},_attachDatepicker:function(target,settings){var inlineSettings=null;for(var attrName in this._defaults){var attrValue=target.getAttribute("date:"+attrName);if(attrValue){inlineSettings=inlineSettings||{};try{inlineSettings[attrName]=eval(attrValue)}catch(err){inlineSettings[attrName]=attrValue}}}var nodeName=target.nodeName.toLowerCase(),inline=nodeName=="div"||nodeName=="span";target.id||(this.uuid+=1,target.id="dp"+this.uuid);var inst=this._newInst($(target),inline);inst.settings=$.extend({},settings||{},inlineSettings||{}),nodeName=="input"?this._connectDatepicker(target,inst):inline&&this._inlineDatepicker(target,inst)},_newInst:function(a,b){var c=a[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1");return{id:c,input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:b?bindHover($('
')):this.dpDiv}},_connectDatepicker:function(a,b){var c=$(a);b.append=$([]),b.trigger=$([]);c.hasClass(this.markerClassName)||(this._attachments(c,b),c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(a,c,d){b.settings[c]=d}).bind("getData.datepicker",function(a,c){return this._get(b,c)}),this._autoSize(b),$.data(a,PROP_NAME,b),b.settings.disabled&&this._disableDatepicker(a))},_attachments:function(a,b){var c=this._get(b,"appendText"),d=this._get(b,"isRTL");b.append&&b.append.remove(),c&&(b.append=$(''+c+""),a[d?"before":"after"](b.append)),a.unbind("focus",this._showDatepicker),b.trigger&&b.trigger.remove();var e=this._get(b,"showOn");(e=="focus"||e=="both")&&a.focus(this._showDatepicker);if(e=="button"||e=="both"){var f=this._get(b,"buttonText"),g=this._get(b,"buttonImage");b.trigger=$(this._get(b,"buttonImageOnly")?$("").addClass(this._triggerClass).attr({src:g,alt:f,title:f}):$('').addClass(this._triggerClass).html(g==""?f:$("").attr({src:g,alt:f,title:f}))),a[d?"before":"after"](b.trigger),b.trigger.click(function(){$.datepicker._datepickerShowing&&$.datepicker._lastInput==a[0]?$.datepicker._hideDatepicker():$.datepicker._datepickerShowing&&$.datepicker._lastInput!=a[0]?($.datepicker._hideDatepicker(),$.datepicker._showDatepicker(a[0])):$.datepicker._showDatepicker(a[0]);return!1})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var d=function(a){var b=0,c=0;for(var d=0;db&&(b=a[d].length,c=d);return c};b.setMonth(d(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort"))),b.setDate(d(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=$(a);c.hasClass(this.markerClassName)||(c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(a,c,d){b.settings[c]=d}).bind("getData.datepicker",function(a,c){return this._get(b,c)}),$.data(a,PROP_NAME,b),this._setDate(b,this._getDefaultDate(b),!0),this._updateDatepicker(b),this._updateAlternate(b),b.settings.disabled&&this._disableDatepicker(a),b.dpDiv.css("display","block"))},_dialogDatepicker:function(a,b,c,d,e){var f=this._dialogInst;if(!f){this.uuid+=1;var g="dp"+this.uuid;this._dialogInput=$(''),this._dialogInput.keydown(this._doKeyDown),$("body").append(this._dialogInput),f=this._dialogInst=this._newInst(this._dialogInput,!1),f.settings={},$.data(this._dialogInput[0],PROP_NAME,f)}extendRemove(f.settings,d||{}),b=b&&b.constructor==Date?this._formatDate(f,b):b,this._dialogInput.val(b),this._pos=e?e.length?e:[e.pageX,e.pageY]:null;if(!this._pos){var h=document.documentElement.clientWidth,i=document.documentElement.clientHeight,j=document.documentElement.scrollLeft||document.body.scrollLeft,k=document.documentElement.scrollTop||document.body.scrollTop;this._pos=[h/2-100+j,i/2-150+k]}this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),f.settings.onSelect=c,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),$.blockUI&&$.blockUI(this.dpDiv),$.data(this._dialogInput[0],PROP_NAME,f);return this},_destroyDatepicker:function(a){var b=$(a),c=$.data(a,PROP_NAME);if(!!b.hasClass(this.markerClassName)){var d=a.nodeName.toLowerCase();$.removeData(a,PROP_NAME),d=="input"?(c.append.remove(),c.trigger.remove(),b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):(d=="div"||d=="span")&&b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=$(a),c=$.data(a,PROP_NAME);if(!!b.hasClass(this.markerClassName)){var d=a.nodeName.toLowerCase();if(d=="input")a.disabled=!1,c.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""});else if(d=="div"||d=="span"){var e=b.children("."+this._inlineClass);e.children().removeClass("ui-state-disabled"),e.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=$.map(this._disabledInputs,function(b){return b==a?null:b})}},_disableDatepicker:function(a){var b=$(a),c=$.data(a,PROP_NAME);if(!!b.hasClass(this.markerClassName)){var d=a.nodeName.toLowerCase();if(d=="input")a.disabled=!0,c.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"});else if(d=="div"||d=="span"){var e=b.children("."+this._inlineClass);e.children().addClass("ui-state-disabled"),e.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=$.map(this._disabledInputs,function(b){return b==a?null:b}),this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return!1;for(var b=0;b-1}},_doKeyUp:function(a){var b=$.datepicker._getInst(a.target);if(b.input.val()!=b.lastVal)try{var c=$.datepicker.parseDate($.datepicker._get(b,"dateFormat"),b.input?b.input.val():null,$.datepicker._getFormatConfig(b));c&&($.datepicker._setDateFromField(b),$.datepicker._updateAlternate(b),$.datepicker._updateDatepicker(b))}catch(a){$.datepicker.log(a)}return!0},_showDatepicker:function(a){a=a.target||a,a.nodeName.toLowerCase()!="input"&&(a=$("input",a.parentNode)[0]);if(!$.datepicker._isDisabledDatepicker(a)&&$.datepicker._lastInput!=a){var b=$.datepicker._getInst(a);$.datepicker._curInst&&$.datepicker._curInst!=b&&($.datepicker._curInst.dpDiv.stop(!0,!0),b&&$.datepicker._datepickerShowing&&$.datepicker._hideDatepicker($.datepicker._curInst.input[0]));var c=$.datepicker._get(b,"beforeShow"),d=c?c.apply(a,[a,b]):{};if(d===!1)return;extendRemove(b.settings,d),b.lastVal=null,$.datepicker._lastInput=a,$.datepicker._setDateFromField(b),$.datepicker._inDialog&&(a.value=""),$.datepicker._pos||($.datepicker._pos=$.datepicker._findPos(a),$.datepicker._pos[1]+=a.offsetHeight);var e=!1;$(a).parents().each(function(){e|=$(this).css("position")=="fixed";return!e}),e&&$.browser.opera&&($.datepicker._pos[0]-=document.documentElement.scrollLeft,$.datepicker._pos[1]-=document.documentElement.scrollTop);var f={left:$.datepicker._pos[0],top:$.datepicker._pos[1]};$.datepicker._pos=null,b.dpDiv.empty(),b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),$.datepicker._updateDatepicker(b),f=$.datepicker._checkOffset(b,f,e),b.dpDiv.css({position:$.datepicker._inDialog&&$.blockUI?"static":e?"fixed":"absolute",display:"none",left:f.left+"px",top:f.top+"px"});if(!b.inline){var g=$.datepicker._get(b,"showAnim"),h=$.datepicker._get(b,"duration"),i=function(){var a=b.dpDiv.find("iframe.ui-datepicker-cover");if(!!a.length){var c=$.datepicker._getBorders(b.dpDiv);a.css({left:-c[0],top:-c[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex($(a).zIndex()+1),$.datepicker._datepickerShowing=!0,$.effects&&$.effects[g]?b.dpDiv.show(g,$.datepicker._get(b,"showOptions"),h,i):b.dpDiv[g||"show"](g?h:null,i),(!g||!h)&&i(),b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus(),$.datepicker._curInst=b}}},_updateDatepicker:function(a){var b=this;b.maxRows=4;var c=$.datepicker._getBorders(a.dpDiv);instActive=a,a.dpDiv.empty().append(this._generateHTML(a));var d=a.dpDiv.find("iframe.ui-datepicker-cover");!d.length||d.css({left:-c[0],top:-c[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()}),a.dpDiv.find("."+this._dayOverClass+" a").mouseover();var e=this._getNumberOfMonths(a),f=e[1],g=17;a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),f>1&&a.dpDiv.addClass("ui-datepicker-multi-"+f).css("width",g*f+"em"),a.dpDiv[(e[0]!=1||e[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi"),a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),a==$.datepicker._curInst&&$.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var h=a.yearshtml;setTimeout(function(){h===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml),h=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(a){return{thin:1,medium:2,thick:3}[a]||a};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var d=a.dpDiv.outerWidth(),e=a.dpDiv.outerHeight(),f=a.input?a.input.outerWidth():0,g=a.input?a.input.outerHeight():0,h=document.documentElement.clientWidth+$(document).scrollLeft(),i=document.documentElement.clientHeight+$(document).scrollTop();b.left-=this._get(a,"isRTL")?d-f:0,b.left-=c&&b.left==a.input.offset().left?$(document).scrollLeft():0,b.top-=c&&b.top==a.input.offset().top+g?$(document).scrollTop():0,b.left-=Math.min(b.left,b.left+d>h&&h>d?Math.abs(b.left+d-h):0),b.top-=Math.min(b.top,b.top+e>i&&i>e?Math.abs(e+g):0);return b},_findPos:function(a){var b=this._getInst(a),c=this._get(b,"isRTL");while(a&&(a.type=="hidden"||a.nodeType!=1||$.expr.filters.hidden(a)))a=a[c?"previousSibling":"nextSibling"];var d=$(a).offset();return[d.left,d.top]},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=$.data(a,PROP_NAME))&&this._datepickerShowing){var c=this._get(b,"showAnim"),d=this._get(b,"duration"),e=this,f=function(){$.datepicker._tidyDialog(b),e._curInst=null};$.effects&&$.effects[c]?b.dpDiv.hide(c,$.datepicker._get(b,"showOptions"),d,f):b.dpDiv[c=="slideDown"?"slideUp":c=="fadeIn"?"fadeOut":"hide"](c?d:null,f),c||f(),this._datepickerShowing=!1;var g=this._get(b,"onClose");g&&g.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),$.blockUI&&($.unblockUI(),$("body").append(this.dpDiv))),this._inDialog=!1}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a){if(!!$.datepicker._curInst){var b=$(a.target),c=$.datepicker._getInst(b[0]);(b[0].id!=$.datepicker._mainDivId&&b.parents("#"+$.datepicker._mainDivId).length==0&&!b.hasClass($.datepicker.markerClassName)&&!b.closest("."+$.datepicker._triggerClass).length&&$.datepicker._datepickerShowing&&(!$.datepicker._inDialog||!$.blockUI)||b.hasClass($.datepicker.markerClassName)&&$.datepicker._curInst!=c)&&$.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){var d=$(a),e=this._getInst(d[0]);this._isDisabledDatepicker(d[0])||(this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):0),c),this._updateDatepicker(e))},_gotoToday:function(a){var b=$(a),c=this._getInst(b[0]);if(this._get(c,"gotoCurrent")&&c.currentDay)c.selectedDay=c.currentDay,c.drawMonth=c.selectedMonth=c.currentMonth,c.drawYear=c.selectedYear=c.currentYear;else{var d=new Date;c.selectedDay=d.getDate(),c.drawMonth=c.selectedMonth=d.getMonth(),c.drawYear=c.selectedYear=d.getFullYear()}this._notifyChange(c),this._adjustDate(b)},_selectMonthYear:function(a,b,c){var d=$(a),e=this._getInst(d[0]);e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10),this._notifyChange(e),this._adjustDate(d)},_selectDay:function(a,b,c,d){var e=$(a);if(!$(d).hasClass(this._unselectableClass)&&!this._isDisabledDatepicker(e[0])){var f=this._getInst(e[0]);f.selectedDay=f.currentDay=$("a",d).html(),f.selectedMonth=f.currentMonth=b,f.selectedYear=f.currentYear=c,this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){var b=$(a),c=this._getInst(b[0]);this._selectDate(b,"")},_selectDate:function(a,b){var c=$(a),d=this._getInst(c[0]);b=b!=null?b:this._formatDate(d),d.input&&d.input.val(b),this._updateAlternate(d);var e=this._get(d,"onSelect");e?e.apply(d.input?d.input[0]:null,[b,d]):d.input&&d.input.trigger("change"),d.inline?this._updateDatepicker(d):(this._hideDatepicker(),this._lastInput=d.input[0],typeof d.input[0]!="object"&&d.input.focus(),this._lastInput=null)},_updateAlternate:function(a){var b=this._get(a,"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),d=this._getDate(a),e=this.formatDate(c,d,this._getFormatConfig(a));$(b).each(function(){$(this).val(e)})}},noWeekends:function(a){var b=a.getDay();return[b>0&&b<6,""]},iso8601Week:function(a){var b=new Date(a.getTime());b.setDate(b.getDate()+4-(b.getDay()||7));var c=b.getTime();b.setMonth(0),b.setDate(1);return Math.floor(Math.round((c-b)/864e5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?b.toString():b+"";if(b=="")return null;var d=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;d=typeof d!="string"?d:(new Date).getFullYear()%100+parseInt(d,10);var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,g=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,h=(c?c.monthNames:null)||this._defaults.monthNames,i=-1,j=-1,k=-1,l=-1,m=!1,n=function(b){var c=s+1-1){j=1,k=l;for(;;){var u=this._getDaysInMonth(i,j-1);if(k<=u)break;j++,k-=u}}var t=this._daylightSavingAdjust(new Date(i,j-1,k));if(t.getFullYear()!=i||t.getMonth()+1!=j||t.getDate()!=k)throw"Invalid date";return t},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1e7,formatDate:function(a,b,c){if(!b)return"";var d=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,e=(c?c.dayNames:null)||this._defaults.dayNames,f=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,h=function(b){var c=m+112?a.getHours()+2:0);return a},_setDate:function(a,b,c){var d=!b,e=a.selectedMonth,f=a.selectedYear,g=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=g.getDate(),a.drawMonth=a.selectedMonth=a.currentMonth=g.getMonth(),a.drawYear=a.selectedYear=a.currentYear=g.getFullYear(),(e!=a.selectedMonth||f!=a.selectedYear)&&!c&&this._notifyChange(a),this._adjustInstDate(a),a.input&&a.input.val(d?"":this._formatDate(a))},_getDate:function(a){var b=!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return b},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),d=this._get(a,"showButtonPanel"),e=this._get(a,"hideIfNoPrevNext"),f=this._get(a,"navigationAsDateFormat"),g=this._getNumberOfMonths(a),h=this._get(a,"showCurrentAtPos"),i=this._get(a,"stepMonths"),j=g[0]!=1||g[1]!=1,k=this._daylightSavingAdjust(a.currentDay?new Date(a.currentYear,a.currentMonth,a.currentDay):new Date(9999,9,9)),l=this._getMinMaxDate(a,"min"),m=this._getMinMaxDate(a,"max"),n=a.drawMonth-h,o=a.drawYear;n<0&&(n+=12,o--);if(m){var p=this._daylightSavingAdjust(new Date(m.getFullYear(),m.getMonth()-g[0]*g[1]+1,m.getDate()));p=l&&pp)n--,n<0&&(n=11,o--)}a.drawMonth=n,a.drawYear=o;var q=this._get(a,"prevText");q=f?this.formatDate(q,this._daylightSavingAdjust(new Date(o,n-i,1)),this._getFormatConfig(a)):q;var r=this._canAdjustMonth(a,-1,o,n)?''+q+"":e?"":''+q+"",s=this._get(a,"nextText");s=f?this.formatDate(s,this._daylightSavingAdjust(new Date(o,n+i,1)),this._getFormatConfig(a)):s;var t=this._canAdjustMonth(a,1,o,n)?''+s+"":e?"":''+s+"",u=this._get(a,"currentText"),v=this._get(a,"gotoCurrent")&&a.currentDay?k:b;u=f?this.formatDate(u,v,this._getFormatConfig(a)):u;var w=a.inline?"":'",x=d?'
'+(c?w:"")+(this._isInRange(a,v)?'":"")+(c?"":w)+"
":"",y=parseInt(this._get(a,"firstDay"),10);y=isNaN(y)?0:y;var z=this._get(a,"showWeek"),A=this._get(a,"dayNames"),B=this._get(a,"dayNamesShort"),C=this._get(a,"dayNamesMin"),D=this._get(a,"monthNames"),E=this._get(a,"monthNamesShort"),F=this._get(a,"beforeShowDay"),G=this._get(a,"showOtherMonths"),H=this._get(a,"selectOtherMonths"),I=this._get(a,"calculateWeek")||this.iso8601Week,J=this._getDefaultDate(a),K="";for(var L=0;L1)switch(N){case 0:Q+=" ui-datepicker-group-first",P=" ui-corner-"+(c?"right":"left");break;case g[1]-1:Q+=" ui-datepicker-group-last",P=" ui-corner-"+(c?"left":"right");break;default:Q+=" ui-datepicker-group-middle",P=""}Q+='">'}Q+='
'+(/all|left/.test(P)&&L==0?c?t:r:"")+(/all|right/.test(P)&&L==0?c?r:t:"")+this._generateMonthYearHeader(a,n,o,l,m,L>0||N>0,D,E)+'
'+"";var R=z?'":"";for(var S=0;S<7;S++){var T=(S+y)%7;R+="=5?' class="ui-datepicker-week-end"':"")+">"+''+C[T]+""}Q+=R+"";var U=this._getDaysInMonth(o,n);o==a.selectedYear&&n==a.selectedMonth&&(a.selectedDay=Math.min(a.selectedDay,U));var V=(this._getFirstDayOfMonth(o,n)-y+7)%7,W=Math.ceil((V+U)/7),X=j?this.maxRows>W?this.maxRows:W:W;this.maxRows=X;var Y=this._daylightSavingAdjust(new Date(o,n,1-V));for(var Z=0;Z";var _=z?'":"";for(var S=0;S<7;S++){var ba=F?F.apply(a.input?a.input[0]:null,[Y]):[!0,""],bb=Y.getMonth()!=n,bc=bb&&!H||!ba[0]||l&&Ym;_+='",Y.setDate(Y.getDate()+1),Y=this._daylightSavingAdjust(Y)}Q+=_+""}n++,n>11&&(n=0,o++),Q+="
'+this._get(a,"weekHeader")+"
'+this._get(a,"calculateWeek")(Y)+""+(bb&&!G?" ":bc?''+Y.getDate()+"":''+Y.getDate()+"")+"
"+(j?""+(g[0]>0&&N==g[1]-1?'
':""):""),M+=Q}K+=M}K+=x+($.browser.msie&&parseInt($.browser.version,10)<7&&!a.inline?'':""), a._keyEvent=!1;return K},_generateMonthYearHeader:function(a,b,c,d,e,f,g,h){var i=this._get(a,"changeMonth"),j=this._get(a,"changeYear"),k=this._get(a,"showMonthAfterYear"),l='
',m="";if(f||!i)m+=''+g[b]+"";else{var n=d&&d.getFullYear()==c,o=e&&e.getFullYear()==c;m+='"}k||(l+=m+(f||!i||!j?" ":""));if(!a.yearshtml){a.yearshtml="";if(f||!j)l+=''+c+"";else{var q=this._get(a,"yearRange").split(":"),r=(new Date).getFullYear(),s=function(a){var b=a.match(/c[+-].*/)?c+parseInt(a.substring(1),10):a.match(/[+-].*/)?r+parseInt(a,10):parseInt(a,10);return isNaN(b)?r:b},t=s(q[0]),u=Math.max(t,s(q[1]||""));t=d?Math.max(t,d.getFullYear()):t,u=e?Math.min(u,e.getFullYear()):u,a.yearshtml+='",l+=a.yearshtml,a.yearshtml=null}}l+=this._get(a,"yearSuffix"),k&&(l+=(f||!i||!j?" ":"")+m),l+="
";return l},_adjustInstDate:function(a,b,c){var d=a.drawYear+(c=="Y"?b:0),e=a.drawMonth+(c=="M"?b:0),f=Math.min(a.selectedDay,this._getDaysInMonth(d,e))+(c=="D"?b:0),g=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(d,e,f)));a.selectedDay=g.getDate(),a.drawMonth=a.selectedMonth=g.getMonth(),a.drawYear=a.selectedYear=g.getFullYear(),(c=="M"||c=="Y")&&this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min"),d=this._getMinMaxDate(a,"max"),e=c&&bd?d:e;return e},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");b&&b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){var b=this._get(a,"numberOfMonths");return b==null?[1,1]:typeof b=="number"?[1,b]:b},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,d){var e=this._getNumberOfMonths(a),f=this._daylightSavingAdjust(new Date(c,d+(b<0?b:e[0]*e[1]),1));b<0&&f.setDate(this._getDaysInMonth(f.getFullYear(),f.getMonth()));return this._isInRange(a,f)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min"),d=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!d||b.getTime()<=d.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,d){b||(a.currentDay=a.selectedDay,a.currentMonth=a.selectedMonth,a.currentYear=a.selectedYear);var e=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(d,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),e,this._getFormatConfig(a))}}),$.fn.datepicker=function(a){if(!this.length)return this;$.datepicker.initialized||($(document).mousedown($.datepicker._checkExternalClick).find("body").append($.datepicker.dpDiv),$.datepicker.initialized=!0);var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return $.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return $.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b));return this.each(function(){typeof a=="string"?$.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this].concat(b)):$.datepicker._attachDatepicker(this,a)})},$.datepicker=new Datepicker,$.datepicker.initialized=!1,$.datepicker.uuid=(new Date).getTime(),$.datepicker.version="1.8.18",window["DP_jQuery_"+dpuuid]=$})(jQuery); \ No newline at end of file diff --git a/WebContent/js/jquery.dataTables.min.js b/src/main/webapp/js/jquery.dataTables.min.js similarity index 100% rename from WebContent/js/jquery.dataTables.min.js rename to src/main/webapp/js/jquery.dataTables.min.js diff --git a/WebContent/js/jquery.validate.min.js b/src/main/webapp/js/jquery.validate.min.js similarity index 100% rename from WebContent/js/jquery.validate.min.js rename to src/main/webapp/js/jquery.validate.min.js diff --git a/WebContent/js/libs/modernizr.min.js b/src/main/webapp/js/libs/modernizr.min.js similarity index 99% rename from WebContent/js/libs/modernizr.min.js rename to src/main/webapp/js/libs/modernizr.min.js index 5354117..796f99e 100644 --- a/WebContent/js/libs/modernizr.min.js +++ b/src/main/webapp/js/libs/modernizr.min.js @@ -1 +1 @@ -window.Modernizr=(function(A,c,g){var I="2.6.2",w={},y=true,L=c.documentElement,a="modernizr",H=c.createElement(a),E=H.style,K=c.createElement("input"),C=":)",b={}.toString,j=" -webkit- -moz- -o- -ms- ".split(" "),h="Webkit Moz O ms",F=h.split(" "),J=h.toLowerCase().split(" "),G={svg:"http://www.w3.org/2000/svg"},l={},p={},f={},e=[],k=e.slice,s,n=function(U,W,O,V){var N,T,Q,R,M=c.createElement("div"),S=c.body,P=S||c.createElement("body");if(parseInt(O,10)){while(O--){Q=c.createElement("div");Q.id=V?V[O]:a+(O+1);M.appendChild(Q)}}N=["­",'"].join("");M.id=a;(S?M:P).innerHTML+=N;P.appendChild(M);if(!S){P.style.background="";P.style.overflow="hidden";R=L.style.overflow;L.style.overflow="hidden";L.appendChild(P)}T=W(M,U);if(!S){P.parentNode.removeChild(P);L.style.overflow=R}else{M.parentNode.removeChild(M)}return !!T},o=(function(){var N={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};function M(O,Q){Q=Q||c.createElement(N[O]||"div");O="on"+O;var P=O in Q;if(!P){if(!Q.setAttribute){Q=c.createElement("div")}if(Q.setAttribute&&Q.removeAttribute){Q.setAttribute(O,"");P=r(Q[O],"function");if(!r(Q[O],"undefined")){Q[O]=g}Q.removeAttribute(O)}}Q=null;return P}return M})(),i=({}).hasOwnProperty,x;if(!r(i,"undefined")&&!r(i.call,"undefined")){x=function(M,N){return i.call(M,N)}}else{x=function(M,N){return((N in M)&&r(M.constructor.prototype[N],"undefined"))}}if(!Function.prototype.bind){Function.prototype.bind=function d(O){var P=this;if(typeof P!="function"){throw new TypeError()}var M=k.call(arguments,1),N=function(){if(this instanceof N){var S=function(){};S.prototype=P.prototype;var R=new S();var Q=P.apply(R,M.concat(k.call(arguments)));if(Object(Q)===Q){return Q}return R}else{return P.apply(O,M.concat(k.call(arguments)))}};return N}}function D(M){E.cssText=M}function u(N,M){return D(j.join(N+";")+(M||""))}function r(N,M){return typeof N===M}function t(N,M){return !!~(""+N).indexOf(M)}function z(O,M){for(var N in O){var P=O[N];if(!t(P,"-")&&E[P]!==g){return M=="pfx"?P:true}}return false}function q(N,Q,P){for(var M in N){var O=Q[N[M]];if(O!==g){if(P===false){return N[M]}if(r(O,"function")){return O.bind(P||Q)}return O}}return false}function m(Q,M,P){var N=Q.charAt(0).toUpperCase()+Q.slice(1),O=(Q+" "+F.join(N+" ")+N).split(" ");if(r(M,"string")||r(M,"undefined")){return z(O,M)}else{O=(Q+" "+(J).join(N+" ")+N).split(" ");return q(O,M,P)}}l.flexbox=function(){return m("flexWrap")};l.canvas=function(){var M=c.createElement("canvas");return !!(M.getContext&&M.getContext("2d"))};l.canvastext=function(){return !!(w.canvas&&r(c.createElement("canvas").getContext("2d").fillText,"function"))};l.webgl=function(){return !!A.WebGLRenderingContext};l.touch=function(){var M;if(("ontouchstart" in A)||A.DocumentTouch&&c instanceof DocumentTouch){M=true}else{n(["@media (",j.join("touch-enabled),("),a,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(N){M=N.offsetTop===9})}return M};l.geolocation=function(){return"geolocation" in navigator};l.postmessage=function(){return !!A.postMessage};l.websqldatabase=function(){return !!A.openDatabase};l.indexedDB=function(){return !!m("indexedDB",A)};l.hashchange=function(){return o("hashchange",A)&&(c.documentMode===g||c.documentMode>7)};l.history=function(){return !!(A.history&&history.pushState)};l.draganddrop=function(){var M=c.createElement("div");return("draggable" in M)||("ondragstart" in M&&"ondrop" in M)};l.websockets=function(){return"WebSocket" in A||"MozWebSocket" in A};l.rgba=function(){D("background-color:rgba(150,255,150,.5)");return t(E.backgroundColor,"rgba")};l.hsla=function(){D("background-color:hsla(120,40%,100%,.5)");return t(E.backgroundColor,"rgba")||t(E.backgroundColor,"hsla")};l.multiplebgs=function(){D("background:url(https://),url(https://),red url(https://)");return(/(url\s*\(.*?){3}/).test(E.background)};l.backgroundsize=function(){return m("backgroundSize")};l.borderimage=function(){return m("borderImage")};l.borderradius=function(){return m("borderRadius")};l.boxshadow=function(){return m("boxShadow")};l.textshadow=function(){return c.createElement("div").style.textShadow===""};l.opacity=function(){u("opacity:.55");return(/^0.55$/).test(E.opacity)};l.cssanimations=function(){return m("animationName")};l.csscolumns=function(){return m("columnCount")};l.cssgradients=function(){var O="background-image:",N="gradient(linear,left top,right bottom,from(#9f9),to(white));",M="linear-gradient(left top,#9f9, white);";D((O+"-webkit- ".split(" ").join(N+O)+j.join(M+O)).slice(0,-O.length));return t(E.backgroundImage,"gradient")};l.cssreflections=function(){return m("boxReflect")};l.csstransforms=function(){return !!m("transform")};l.csstransforms3d=function(){var M=!!m("perspective");if(M&&"webkitPerspective" in L.style){n("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(N,O){M=N.offsetLeft===9&&N.offsetHeight===3})}return M};l.csstransitions=function(){return m("transition")};l.fontface=function(){var M;n('@font-face {font-family:"font";src:url("https://")}',function(Q,R){var P=c.getElementById("smodernizr"),N=P.sheet||P.styleSheet,O=N?(N.cssRules&&N.cssRules[0]?N.cssRules[0].cssText:N.cssText||""):"";M=/src/i.test(O)&&O.indexOf(R.split(" ")[0])===0});return M};l.generatedcontent=function(){var M;n(["#",a,"{font:0/0 a}#",a,':after{content:"',C,'";visibility:hidden;font:3px/1 a}'].join(""),function(N){M=N.offsetHeight>=3});return M};l.video=function(){var N=c.createElement("video"),M=false;try{if(M=!!N.canPlayType){M=new Boolean(M);M.ogg=N.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,"");M.h264=N.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,"");M.webm=N.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}}catch(O){}return M};l.audio=function(){var N=c.createElement("audio"),M=false;try{if(M=!!N.canPlayType){M=new Boolean(M);M.ogg=N.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,"");M.mp3=N.canPlayType("audio/mpeg;").replace(/^no$/,"");M.wav=N.canPlayType('audio/wav; codecs="1"').replace(/^no$/,"");M.m4a=(N.canPlayType("audio/x-m4a;")||N.canPlayType("audio/aac;")).replace(/^no$/,"")}}catch(O){}return M};l.localstorage=function(){try{localStorage.setItem(a,a);localStorage.removeItem(a);return true}catch(M){return false}};l.sessionstorage=function(){try{sessionStorage.setItem(a,a);sessionStorage.removeItem(a);return true}catch(M){return false}};l.webworkers=function(){return !!A.Worker};l.applicationcache=function(){return !!A.applicationCache};l.svg=function(){return !!c.createElementNS&&!!c.createElementNS(G.svg,"svg").createSVGRect};l.inlinesvg=function(){var M=c.createElement("div");M.innerHTML="";return(M.firstChild&&M.firstChild.namespaceURI)==G.svg};l.smil=function(){return !!c.createElementNS&&/SVGAnimate/.test(b.call(c.createElementNS(G.svg,"animate")))};l.svgclippaths=function(){return !!c.createElementNS&&/SVGClipPath/.test(b.call(c.createElementNS(G.svg,"clipPath")))};function B(){w.input=(function(O){for(var N=0,M=O.length;N";ab=("hidden" in ae);Q=ae.childNodes.length==1||(function(){(X.createElement)("a");var ag=X.createDocumentFragment();return(typeof ag.cloneNode=="undefined"||typeof ag.createDocumentFragment=="undefined"||typeof ag.createElement=="undefined")}())}catch(af){ab=true;Q=true}}());function R(ae,ag){var ah=ae.createElement("p"),af=ae.getElementsByTagName("head")[0]||ae.documentElement;ah.innerHTML="x";return af.insertBefore(ah.lastChild,af.firstChild)}function W(){var ae=U.elements;return typeof ae=="string"?ae.split(" "):ae}function aa(ae){var af=Z[ae[T]];if(!af){af={};M++;ae[T]=M;Z[M]=af}return af}function Y(ah,ae,ag){if(!ae){ae=X}if(Q){return ae.createElement(ah)}if(!ag){ag=aa(ae)}var af;if(ag.cache[ah]){af=ag.cache[ah].cloneNode()}else{if(N.test(ah)){af=(ag.cache[ah]=ag.createElem(ah)).cloneNode()}else{af=ag.createElem(ah)}}return af.canHaveChildren&&!S.test(ah)?ag.frag.appendChild(af):af}function ac(ag,ai){if(!ag){ag=X}if(Q){return ag.createDocumentFragment()}ai=ai||aa(ag);var aj=ai.frag.cloneNode(),ah=0,af=W(),ae=af.length;for(;ah',U,""].join("");M.id=a;(S?M:P).innerHTML+=N;P.appendChild(M);if(!S){P.style.background="";P.style.overflow="hidden";R=L.style.overflow;L.style.overflow="hidden";L.appendChild(P)}T=W(M,U);if(!S){P.parentNode.removeChild(P);L.style.overflow=R}else{M.parentNode.removeChild(M)}return !!T},o=(function(){var N={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};function M(O,Q){Q=Q||c.createElement(N[O]||"div");O="on"+O;var P=O in Q;if(!P){if(!Q.setAttribute){Q=c.createElement("div")}if(Q.setAttribute&&Q.removeAttribute){Q.setAttribute(O,"");P=r(Q[O],"function");if(!r(Q[O],"undefined")){Q[O]=g}Q.removeAttribute(O)}}Q=null;return P}return M})(),i=({}).hasOwnProperty,x;if(!r(i,"undefined")&&!r(i.call,"undefined")){x=function(M,N){return i.call(M,N)}}else{x=function(M,N){return((N in M)&&r(M.constructor.prototype[N],"undefined"))}}if(!Function.prototype.bind){Function.prototype.bind=function d(O){var P=this;if(typeof P!="function"){throw new TypeError()}var M=k.call(arguments,1),N=function(){if(this instanceof N){var S=function(){};S.prototype=P.prototype;var R=new S();var Q=P.apply(R,M.concat(k.call(arguments)));if(Object(Q)===Q){return Q}return R}else{return P.apply(O,M.concat(k.call(arguments)))}};return N}}function D(M){E.cssText=M}function u(N,M){return D(j.join(N+";")+(M||""))}function r(N,M){return typeof N===M}function t(N,M){return !!~(""+N).indexOf(M)}function z(O,M){for(var N in O){var P=O[N];if(!t(P,"-")&&E[P]!==g){return M=="pfx"?P:true}}return false}function q(N,Q,P){for(var M in N){var O=Q[N[M]];if(O!==g){if(P===false){return N[M]}if(r(O,"function")){return O.bind(P||Q)}return O}}return false}function m(Q,M,P){var N=Q.charAt(0).toUpperCase()+Q.slice(1),O=(Q+" "+F.join(N+" ")+N).split(" ");if(r(M,"string")||r(M,"undefined")){return z(O,M)}else{O=(Q+" "+(J).join(N+" ")+N).split(" ");return q(O,M,P)}}l.flexbox=function(){return m("flexWrap")};l.canvas=function(){var M=c.createElement("canvas");return !!(M.getContext&&M.getContext("2d"))};l.canvastext=function(){return !!(w.canvas&&r(c.createElement("canvas").getContext("2d").fillText,"function"))};l.webgl=function(){return !!A.WebGLRenderingContext};l.touch=function(){var M;if(("ontouchstart" in A)||A.DocumentTouch&&c instanceof DocumentTouch){M=true}else{n(["@media (",j.join("touch-enabled),("),a,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(N){M=N.offsetTop===9})}return M};l.geolocation=function(){return"geolocation" in navigator};l.postmessage=function(){return !!A.postMessage};l.websqldatabase=function(){return !!A.openDatabase};l.indexedDB=function(){return !!m("indexedDB",A)};l.hashchange=function(){return o("hashchange",A)&&(c.documentMode===g||c.documentMode>7)};l.history=function(){return !!(A.history&&history.pushState)};l.draganddrop=function(){var M=c.createElement("div");return("draggable" in M)||("ondragstart" in M&&"ondrop" in M)};l.websockets=function(){return"WebSocket" in A||"MozWebSocket" in A};l.rgba=function(){D("background-color:rgba(150,255,150,.5)");return t(E.backgroundColor,"rgba")};l.hsla=function(){D("background-color:hsla(120,40%,100%,.5)");return t(E.backgroundColor,"rgba")||t(E.backgroundColor,"hsla")};l.multiplebgs=function(){D("background:url(https://),url(https://),red url(https://)");return(/(url\s*\(.*?){3}/).test(E.background)};l.backgroundsize=function(){return m("backgroundSize")};l.borderimage=function(){return m("borderImage")};l.borderradius=function(){return m("borderRadius")};l.boxshadow=function(){return m("boxShadow")};l.textshadow=function(){return c.createElement("div").style.textShadow===""};l.opacity=function(){u("opacity:.55");return(/^0.55$/).test(E.opacity)};l.cssanimations=function(){return m("animationName")};l.csscolumns=function(){return m("columnCount")};l.cssgradients=function(){var O="background-image:",N="gradient(linear,left top,right bottom,from(#9f9),to(white));",M="linear-gradient(left top,#9f9, white);";D((O+"-webkit- ".split(" ").join(N+O)+j.join(M+O)).slice(0,-O.length));return t(E.backgroundImage,"gradient")};l.cssreflections=function(){return m("boxReflect")};l.csstransforms=function(){return !!m("transform")};l.csstransforms3d=function(){var M=!!m("perspective");if(M&&"webkitPerspective" in L.style){n("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(N,O){M=N.offsetLeft===9&&N.offsetHeight===3})}return M};l.csstransitions=function(){return m("transition")};l.fontface=function(){var M;n('@font-face {font-family:"font";src:url("https://")}',function(Q,R){var P=c.getElementById("smodernizr"),N=P.sheet||P.styleSheet,O=N?(N.cssRules&&N.cssRules[0]?N.cssRules[0].cssText:N.cssText||""):"";M=/src/i.test(O)&&O.indexOf(R.split(" ")[0])===0});return M};l.generatedcontent=function(){var M;n(["#",a,"{font:0/0 a}#",a,':after{content:"',C,'";visibility:hidden;font:3px/1 a}'].join(""),function(N){M=N.offsetHeight>=3});return M};l.video=function(){var N=c.createElement("video"),M=false;try{if(M=!!N.canPlayType){M=new Boolean(M);M.ogg=N.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,"");M.h264=N.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,"");M.webm=N.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}}catch(O){}return M};l.audio=function(){var N=c.createElement("audio"),M=false;try{if(M=!!N.canPlayType){M=new Boolean(M);M.ogg=N.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,"");M.mp3=N.canPlayType("audio/mpeg;").replace(/^no$/,"");M.wav=N.canPlayType('audio/wav; codecs="1"').replace(/^no$/,"");M.m4a=(N.canPlayType("audio/x-m4a;")||N.canPlayType("audio/aac;")).replace(/^no$/,"")}}catch(O){}return M};l.localstorage=function(){try{localStorage.setItem(a,a);localStorage.removeItem(a);return true}catch(M){return false}};l.sessionstorage=function(){try{sessionStorage.setItem(a,a);sessionStorage.removeItem(a);return true}catch(M){return false}};l.webworkers=function(){return !!A.Worker};l.applicationcache=function(){return !!A.applicationCache};l.svg=function(){return !!c.createElementNS&&!!c.createElementNS(G.svg,"svg").createSVGRect};l.inlinesvg=function(){var M=c.createElement("div");M.innerHTML="";return(M.firstChild&&M.firstChild.namespaceURI)==G.svg};l.smil=function(){return !!c.createElementNS&&/SVGAnimate/.test(b.call(c.createElementNS(G.svg,"animate")))};l.svgclippaths=function(){return !!c.createElementNS&&/SVGClipPath/.test(b.call(c.createElementNS(G.svg,"clipPath")))};function B(){w.input=(function(O){for(var N=0,M=O.length;N";ab=("hidden" in ae);Q=ae.childNodes.length==1||(function(){(X.createElement)("a");var ag=X.createDocumentFragment();return(typeof ag.cloneNode=="undefined"||typeof ag.createDocumentFragment=="undefined"||typeof ag.createElement=="undefined")}())}catch(af){ab=true;Q=true}}());function R(ae,ag){var ah=ae.createElement("p"),af=ae.getElementsByTagName("head")[0]||ae.documentElement;ah.innerHTML="x";return af.insertBefore(ah.lastChild,af.firstChild)}function W(){var ae=U.elements;return typeof ae=="string"?ae.split(" "):ae}function aa(ae){var af=Z[ae[T]];if(!af){af={};M++;ae[T]=M;Z[M]=af}return af}function Y(ah,ae,ag){if(!ae){ae=X}if(Q){return ae.createElement(ah)}if(!ag){ag=aa(ae)}var af;if(ag.cache[ah]){af=ag.cache[ah].cloneNode()}else{if(N.test(ah)){af=(ag.cache[ah]=ag.createElem(ah)).cloneNode()}else{af=ag.createElem(ah)}}return af.canHaveChildren&&!S.test(ah)?ag.frag.appendChild(af):af}function ac(ag,ai){if(!ag){ag=X}if(Q){return ag.createDocumentFragment()}ai=ai||aa(ag);var aj=ai.frag.cloneNode(),ah=0,af=W(),ae=af.length;for(;ahul>li>figure:first-child').on("click",function(){ - if(!$(this).parent().find('.subSide').length){ - $('.subSide').slideUp(); - } - var ac = $('.sideBar > ul >li.active')[0]; - $(this).parent().addClass('active'); - $(ac).removeClass('active'); - - }); - - //BIND DROPPER SIDEBAR ACTIONS - $('.sideBar > ul > li.dropper >figure:first-child').on("click",function(){ - $(this).parent().find('.subSide').slideToggle(300); - var ac = $('.sideBar > ul >li.active')[0]; - - var par = $(this).parent()[0]; - $(ac).removeClass('active'); - $(par).addClass('active'); - }); - - //Switch NavLinks Activation State - $('.nav li').on("click",function(e){ - var active = $('.nav li.active')[0]; - $(active).removeClass('active'); - $(this).addClass('active'); - }); - - //Bind Tooltips With Anchors only on Navbar - $(".navbar a[rel='tooltip']").tooltip({ - placement:'bottom', - trigger:'hover', - animation:'true' - }); - - - - //Bind Content Loading Script - $('.sideBar li').on("click",function(){ - var dt = $(this).attr('data-target'); - $.ajax({ - url:'pages/'+dt+'.html', - cache:false, - success:function(data){ - $('.content').empty(); - $('.content').html(data); - } - }).done(function(d){ - updateTooltips(); - }); - }); - - - - - //Testing Page Stuff - $('#loadContentTestButton').live("click",function(){ - var target = $('#loadContentTestText')[0].value; - loadContent(target); - }); - - - $("#addProjectAdd").live("click",function(){ - addProject({ - id:$('.table-projects').find('tr:last-child td:nth-child(1)').text()+1, - name:$("#addProjectName")[0].value, - client:$('#addProjectClient')[0].value, - desc: $('#addProjectDesc')[0].value, - messages:"0", - files:"0", - tasks:"0", - completion:"80%" - }); - console.log('Added Project'); - alert('Project Added, Update the Details Using updateProject() function'); - }); - - $("#testAddMiniTask").live("click",function(){ - tasks.add( - $("#testTask")[0].value, - $("#testTaskState")[0].value - ); - }); - $("#testRemoveMiniTask").live("click",function(){ - tasks.remove( - $("#testTaskRemoveId")[0].value - ); - }); - $("#testChangeMiniTask").live("click",function(){ - tasks.changeTask( - $("#testTaskChangeId")[0].value, - $("#testChangeTask")[0].value - ); - }); - $("#testUpdateMiniTask").live("click",function(){ - tasks.updateState( - $("#testTaskUpdateId")[0].value, - $("#testUpdateState")[0].value - ); - }); - -}); - - - - -function fixLayout(){ - $('.content').css('height',getDocHeight()-40+'px'); - $('.sideBar').css('height',getDocHeight()-70+'px'); -} - -//Call this function after updating data that contains tooltips -function updateTooltips(){ - //Bind Tooltips with Buttons - $("button[rel='tooltip']").tooltip({ - placement:'top', - trigger:'hover', - animation:'true' - }); -} - - -//This function is for custom triggering of sidebar content targets -//Usage .. -// loadContent('dashboard') -// or -// loadContent('tables') -// etc. -// If you run into problem... I'm Always Here :) ... Contact me at nanu.clickity@gmail.com -function loadContent(_targetKey){ - $.ajax({ - url:'pages/'+_targetKey+'.html', - cache:false, - success:function(data){ - $('.content').empty(); - $('.content').html(data); - } - }); -} - - -//Call this function to add data to project Table -function addProject(_object){ - var tr = new dummy.project(); - tr.find("td:first-child").text(_object.id); - tr.find("td:nth-child(2)").text(_object.name); - tr.find("td:nth-child(3)").text(_object.client); - tr.find("td:nth-child(4)").text(_object.desc); - tr.find("td:nth-child(5) button:nth-child(1)").html(" "+_object.messages); - tr.find("td:nth-child(5) button:nth-child(2)").html(" "+_object.files); - tr.find("td:nth-child(5) button:nth-child(3)").html(" "+_object.tasks); - tr.find("td:nth-child(6) .bar").css('width',_object.completion); - - $('.table-projects').append(tr); - updateTooltips(); -} - - - - - - - - -/*--------------- TASKS MODULE --------------*/ -var tasks = { - updateIcons: function(){ - //Remove Previous Icons - $("#tasksSideList li").find('i').each(function(index){$(this).remove();}); - - //For Task Completed - $("#tasksSideList li[data-taskState='0']").prepend(" "); - //For Task Incomplete - $("#tasksSideList li[data-taskState='1']").prepend(" "); - }, - add: function(data,state){ - var taskItem = $("
  • ").text(data) - .attr('data-taskId',parseInt($("#tasksSideList").find('li:first-child').attr('data-taskId'))+1) - .attr('data-taskState',state.toString()); - //Prepend to TasksSideList - $('#tasksSideList').prepend(taskItem); - - tasks.update(); - }, - remove: function(taskid){ - $('#tasksSideList li').each(function(index){ - if(parseInt($(this).attr('data-taskId'))==parseInt(taskid)){ - $(this).remove(); - } - }); - tasks.update(); - }, - updateState: function(taskid,taskstate){ - $('#tasksSideList li').each(function(index){ - if(parseInt($(this).attr('data-taskId'))==parseInt(taskid)){ - $(this).attr('data-taskState',taskstate.toString()); - } - }); - tasks.update(); - }, - changeTask: function(taskid,task){ - $('#tasksSideList li').each(function(index){ - if(parseInt($(this).attr('data-taskId'))==parseInt(taskid)){ - $(this).text(task); - } - }); - tasks.update(); - }, - updateNumbers: function(){ - $('#tasksSideList li').each(function(index){ - var space = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]; //Mini List Should not have more than 20 tasks - for(var j=0;j 0){ - $(this).text( $(this).text().replace(ck,'') ); - } - } - var taskId = $(this).attr('data-taskId')+". "; - $(this).prepend(taskId.toString()); - }); - }, - update: function(){ - tasks.updateNumbers(); - tasks.updateIcons(); - } - -}; - - - - - - - - -/* --------- FEATURED ON JAMES PADOLSEY's Website ------------*/ -function getDocHeight() { - var D = document; - return Math.max( - Math.max(D.body.scrollHeight, D.documentElement.scrollHeight), - Math.max(D.body.offsetHeight, D.documentElement.offsetHeight), - Math.max(D.body.clientHeight, D.documentElement.clientHeight) - ); -} -function getDocWidth() { - var D = document; - return Math.max( - Math.max(D.body.scrollWidth, D.documentElement.scrollWidth), - Math.max(D.body.offsetWidth, D.documentElement.offsetWidth), - Math.max(D.body.clientWidth, D.documentElement.clientWidth) - ); -} - - -/*----------- DUMMY OBJECTS -------------*/ -dummy = {}; +$(document).ready(function(){ + $(window).on("load",function(){ + $('#tasksSideList').collapse('hide'); + fixLayout(); + loadContent('dashboard'); + tasks.update(); + }); + $(window).on("resize",function(){ + fixLayout(); + }); + + + //FLIP SIDEBAR ACTIVE + $('.sideBar>ul>li>figure:first-child').on("click",function(){ + if(!$(this).parent().find('.subSide').length){ + $('.subSide').slideUp(); + } + var ac = $('.sideBar > ul >li.active')[0]; + $(this).parent().addClass('active'); + $(ac).removeClass('active'); + + }); + + //BIND DROPPER SIDEBAR ACTIONS + $('.sideBar > ul > li.dropper >figure:first-child').on("click",function(){ + $(this).parent().find('.subSide').slideToggle(300); + var ac = $('.sideBar > ul >li.active')[0]; + + var par = $(this).parent()[0]; + $(ac).removeClass('active'); + $(par).addClass('active'); + }); + + //Switch NavLinks Activation State + $('.nav li').on("click",function(e){ + var active = $('.nav li.active')[0]; + $(active).removeClass('active'); + $(this).addClass('active'); + }); + + //Bind Tooltips With Anchors only on Navbar + $(".navbar a[rel='tooltip']").tooltip({ + placement:'bottom', + trigger:'hover', + animation:'true' + }); + + + + //Bind Content Loading Script + $('.sideBar li').on("click",function(){ + var dt = $(this).attr('data-target'); + $.ajax({ + url:'pages/'+dt+'.html', + cache:false, + success:function(data){ + $('.content').empty(); + $('.content').html(data); + } + }).done(function(d){ + updateTooltips(); + }); + }); + + + + + //Testing Page Stuff + $('#loadContentTestButton').live("click",function(){ + var target = $('#loadContentTestText')[0].value; + loadContent(target); + }); + + + $("#addProjectAdd").live("click",function(){ + addProject({ + id:$('.table-projects').find('tr:last-child td:nth-child(1)').text()+1, + name:$("#addProjectName")[0].value, + client:$('#addProjectClient')[0].value, + desc: $('#addProjectDesc')[0].value, + messages:"0", + files:"0", + tasks:"0", + completion:"80%" + }); + console.log('Added Project'); + alert('Project Added, Update the Details Using updateProject() function'); + }); + + $("#testAddMiniTask").live("click",function(){ + tasks.add( + $("#testTask")[0].value, + $("#testTaskState")[0].value + ); + }); + $("#testRemoveMiniTask").live("click",function(){ + tasks.remove( + $("#testTaskRemoveId")[0].value + ); + }); + $("#testChangeMiniTask").live("click",function(){ + tasks.changeTask( + $("#testTaskChangeId")[0].value, + $("#testChangeTask")[0].value + ); + }); + $("#testUpdateMiniTask").live("click",function(){ + tasks.updateState( + $("#testTaskUpdateId")[0].value, + $("#testUpdateState")[0].value + ); + }); + +}); + + + + +function fixLayout(){ + $('.content').css('height',getDocHeight()-40+'px'); + $('.sideBar').css('height',getDocHeight()-70+'px'); +} + +//Call this function after updating data that contains tooltips +function updateTooltips(){ + //Bind Tooltips with Buttons + $("button[rel='tooltip']").tooltip({ + placement:'top', + trigger:'hover', + animation:'true' + }); +} + + +//This function is for custom triggering of sidebar content targets +//Usage .. +// loadContent('dashboard') +// or +// loadContent('tables') +// etc. +// If you run into problem... I'm Always Here :) ... Contact me at nanu.clickity@gmail.com +function loadContent(_targetKey){ + $.ajax({ + url:'pages/'+_targetKey+'.html', + cache:false, + success:function(data){ + $('.content').empty(); + $('.content').html(data); + } + }); +} + + +//Call this function to add data to project Table +function addProject(_object){ + var tr = new dummy.project(); + tr.find("td:first-child").text(_object.id); + tr.find("td:nth-child(2)").text(_object.name); + tr.find("td:nth-child(3)").text(_object.client); + tr.find("td:nth-child(4)").text(_object.desc); + tr.find("td:nth-child(5) button:nth-child(1)").html(" "+_object.messages); + tr.find("td:nth-child(5) button:nth-child(2)").html(" "+_object.files); + tr.find("td:nth-child(5) button:nth-child(3)").html(" "+_object.tasks); + tr.find("td:nth-child(6) .bar").css('width',_object.completion); + + $('.table-projects').append(tr); + updateTooltips(); +} + + + + + + + + +/*--------------- TASKS MODULE --------------*/ +var tasks = { + updateIcons: function(){ + //Remove Previous Icons + $("#tasksSideList li").find('i').each(function(index){$(this).remove();}); + + //For Task Completed + $("#tasksSideList li[data-taskState='0']").prepend(" "); + //For Task Incomplete + $("#tasksSideList li[data-taskState='1']").prepend(" "); + }, + add: function(data,state){ + var taskItem = $("
  • ").text(data) + .attr('data-taskId',parseInt($("#tasksSideList").find('li:first-child').attr('data-taskId'))+1) + .attr('data-taskState',state.toString()); + //Prepend to TasksSideList + $('#tasksSideList').prepend(taskItem); + + tasks.update(); + }, + remove: function(taskid){ + $('#tasksSideList li').each(function(index){ + if(parseInt($(this).attr('data-taskId'))==parseInt(taskid)){ + $(this).remove(); + } + }); + tasks.update(); + }, + updateState: function(taskid,taskstate){ + $('#tasksSideList li').each(function(index){ + if(parseInt($(this).attr('data-taskId'))==parseInt(taskid)){ + $(this).attr('data-taskState',taskstate.toString()); + } + }); + tasks.update(); + }, + changeTask: function(taskid,task){ + $('#tasksSideList li').each(function(index){ + if(parseInt($(this).attr('data-taskId'))==parseInt(taskid)){ + $(this).text(task); + } + }); + tasks.update(); + }, + updateNumbers: function(){ + $('#tasksSideList li').each(function(index){ + var space = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]; //Mini List Should not have more than 20 tasks + for(var j=0;j 0){ + $(this).text( $(this).text().replace(ck,'') ); + } + } + var taskId = $(this).attr('data-taskId')+". "; + $(this).prepend(taskId.toString()); + }); + }, + update: function(){ + tasks.updateNumbers(); + tasks.updateIcons(); + } + +}; + + + + + + + + +/* --------- FEATURED ON JAMES PADOLSEY's Website ------------*/ +function getDocHeight() { + var D = document; + return Math.max( + Math.max(D.body.scrollHeight, D.documentElement.scrollHeight), + Math.max(D.body.offsetHeight, D.documentElement.offsetHeight), + Math.max(D.body.clientHeight, D.documentElement.clientHeight) + ); +} +function getDocWidth() { + var D = document; + return Math.max( + Math.max(D.body.scrollWidth, D.documentElement.scrollWidth), + Math.max(D.body.offsetWidth, D.documentElement.offsetWidth), + Math.max(D.body.clientWidth, D.documentElement.clientWidth) + ); +} + + +/*----------- DUMMY OBJECTS -------------*/ +dummy = {}; dummy.project = function () { return $("").html("__id____name____client____desc__
    ");} \ No newline at end of file diff --git a/src/service/CheckoutService.java b/src/service/CheckoutService.java deleted file mode 100644 index 016c0b5..0000000 --- a/src/service/CheckoutService.java +++ /dev/null @@ -1,13 +0,0 @@ -package service; - -import java.util.List; - -import Pojo.Applyout; -import Pojo.Checkout; -import Pojo.Zulist; - -public interface CheckoutService { -public void insertcheckout(Checkout checkout); -public List getallcheckout(); -public void deletecheckout(Integer id); -} diff --git a/src/test/Usertest.java b/src/test/java/store/zabbix/Usertest.java similarity index 83% rename from src/test/Usertest.java rename to src/test/java/store/zabbix/Usertest.java index 234d2a2..14613b3 100644 --- a/src/test/Usertest.java +++ b/src/test/java/store/zabbix/Usertest.java @@ -1,54 +1,54 @@ -package test; -import java.util.List; - -import org.junit.Before; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import dao.UserMapper; -import Pojo.User; -import Pojo.UserExample; -import Pojo.UserExample.Criteria; -import javassist.compiler.ast.Symbol; -public class Usertest { -private ApplicationContext applicatonContext; - - @Before - public void setUp() throws Exception{ - String configLocation = "classpath:ApplicationContext-dao.xml"; - applicatonContext = new ClassPathXmlApplicationContext(configLocation); - } - -// @Test -// public void testFindUserById() throws Exception{ -// UserMapper userMapper = (UserMapper)applicatonContext.getBean("userMapper"); -// -// User user = userMapper.findUserById(1); -// System.out.println(user); -// } - - @Test - public void testFindUserById() throws Exception{ - UserMapper userMapper = (UserMapper)applicatonContext.getBean("userMapper"); - - User user = userMapper.selectByPrimaryKey(1); - System.out.println(user); - } - - @Test - public void testFindUserAndSex() throws Exception{ - UserMapper userMapper = (UserMapper)applicatonContext.getBean("userMapper"); - - //创建UserExample对象 - UserExample userExample = new UserExample(); - //通过UserExample对象创建查询条件封装对象(Criteria中是封装的查询条件) - Criteria createCriteria = userExample.createCriteria(); - - //加入查询条件 - createCriteria.andUsernameLike("%z%"); - - List list = userMapper.selectByExample(userExample); - System.out.println(list); - } -} +package java.store.zabbix; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import store.zabbix.dao.UserMapper; +import store.zabbix.pojo.User; +import store.zabbix.pojo.UserExample; +import store.zabbix.pojo.UserExample.Criteria; + +public class Usertest { +private ApplicationContext applicatonContext; + + @Before + public void setUp() throws Exception{ + String configLocation = "classpath:ApplicationContext-store.zabbix.dao.xml"; + applicatonContext = new ClassPathXmlApplicationContext(configLocation); + } + +// @Test +// public void testFindUserById() throws Exception{ +// UserMapper userMapper = (UserMapper)applicatonContext.getBean("userMapper"); +// +// User user = userMapper.findUserById(1); +// System.out.println(user); +// } + + @Test + public void testFindUserById() throws Exception{ + UserMapper userMapper = (UserMapper)applicatonContext.getBean("userMapper"); + + User user = userMapper.selectByPrimaryKey(1); + System.out.println(user); + } + + @Test + public void testFindUserAndSex() throws Exception{ + UserMapper userMapper = (UserMapper)applicatonContext.getBean("userMapper"); + + //创建UserExample对象 + UserExample userExample = new UserExample(); + //通过UserExample对象创建查询条件封装对象(Criteria中是封装的查询条件) + Criteria createCriteria = userExample.createCriteria(); + + //加入查询条件 + createCriteria.andUsernameLike("%z%"); + + List list = userMapper.selectByExample(userExample); + System.out.println(list); + } +}