报表

廖磊
1 parent d0d05b4d
Showing 58 changed files with 1822 additions and 600 deletions
pom.xml
src/main/java/com/bsth/controller/DeviceGpsController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/arrival/AnalyseData.java
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/arrival/DataLoader.java
src/main/java/com/bsth/data/directive/FirstScheduleCheckThread.java
src/main/java/com/bsth/data/directive/GatewayHttpUtils.java
src/main/java/com/bsth/data/forecast/SampleTimeDataLoader.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/match/Arrival2Schedule.java
src/main/java/com/bsth/data/match/ExpectArrivalEnd.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/entity/Line.java
src/main/java/com/bsth/entity/directive/D60.java
src/main/java/com/bsth/entity/directive/DC0_A3.java
@@ -219,6 +219,12 @@
 		    <artifactId>jaxrpc-api</artifactId>
 		    <version>1.1</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
     <dependencyManagement>
@@ -248,7 +254,6 @@
 				<artifactId>maven-war-plugin</artifactId>
 				<version>2.2</version><!--$NO-MVN-MAN-VER$ -->
 				<configuration>
-					<version>3.1</version>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
 				</configuration>
 			</plugin>
@@ -257,6 +262,12 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+			</resource>
+		</resources>
 	</build>
 	<repositories>
 		<repository>
+package com.bsth.controller;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@RestController
+@RequestMapping("devicegps")
+public class DeviceGpsController {
+
+	@Autowired
+	GpsRealData gpsRealData;
+
+	@RequestMapping(value = "/real/line/{lineCode}")
+	public List<GpsEntity> findByLineCode(@PathVariable("lineCode") String lineCode) {
+		return gpsRealData.getByLine(lineCode);
+	}
+
+	@RequestMapping(value = "/real/all")
+	public List<GpsEntity> findByLineCodes() {
+		return new ArrayList<>(gpsRealData.all());
+	}
+	
+	@RequestMapping(value = "/open", method = RequestMethod.POST)
+	public Map<String, Object> open(@RequestParam(value = "_txt_", required = false) MultipartFile file, HttpServletRequest request) {
+		Map<String, Object> res = new HashMap<>();
+		File rf = new File(request.getServletContext().getRealPath("/temp"), System.currentTimeMillis() + "");
+		File rd = rf.getParentFile();
+		if (!rd.exists()) {
+			rd.mkdirs();
+		}
+		
+		BufferedReader reader = null;
+		try {
+			file.transferTo(rf);
+			reader = new BufferedReader(new InputStreamReader(new FileInputStream(rf), "GBK"));
+			String line = null;
+			List<Map<String, Object>> data = new ArrayList<>();
+			while ((line = reader.readLine()) != null) {
+				if (!StringUtils.isEmpty(line)) {
+					String temp[] = line.split(",");
+					if (temp.length != 4) {
+						res.put("errCode", 1);
+						res.put("msg", "txt文档格式错误，请检查");
+						return res;
+					}
+					Map<String, Object> info = new HashMap<>();
+					info.put("lineName", temp[0]);
+					info.put("lineCode", temp[1]);
+					info.put("inCode", temp[2]);
+					info.put("deviceId", temp[3]);
+					info.put("detail", gpsRealData.get(temp[3]));
+					
+					data.add(info);
+				}
+			}
+			// 删除临时文件
+			rf.delete();
+			res.put("errCode", 0);
+			res.put("data", data);
+		} catch (IllegalStateException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+				try {
+					if (reader != null) reader.close();
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+		}
+		
+		return res;
+	}
+	
+	@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/open/filter", method = RequestMethod.POST)
+	public Map<String, Object> filter(@RequestParam(value = "json")String json) {
+		json = StringEscapeUtils.unescapeHtml(json);
+		Map<String, Object> res = new HashMap<>();
+		List<Map<String, Object>> data = null;
+		try {
+			data = new ObjectMapper().readValue(json, List.class);
+			for (Map<String, Object> info : data) {
+				info.put("detail", gpsRealData.findByDeviceId((String)info.get("deviceId")));
+			}
+			
+			res.put("errCode", 0);
+			res.put("data", data);
+		} catch (JsonParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (JsonMappingException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		return res;
+	}
+}
@@ -21,6 +21,11 @@ public class BasicDataController {
 		return BasicData.deviceId2NbbmMap.values();
 	}
+	@RequestMapping("/nbbm2deviceId")
+	public Map<String, String> nbbm2deviceId(Map<String, Object> map){
+		return BasicData.deviceId2NbbmMap.inverse();
+	}
+	
 	@RequestMapping("/lineCode2Name")
 	public Map<String, String> findLineCodeMap(){
 		return BasicData.lineCode2NameMap;
@@ -140,7 +140,7 @@ public class BasicData implements CommandLineRunner{
 				//车辆和线路映射信息
 				loadNbbm2LineInfo();
 				//站点路由信息
-				loadStationRouteInfo();
+				loadStationRouteInfo();	
 				//人员信息
 				loadPersonnelInfo();
 				logger.info("加载基础数据成功！，" );
@@ -78,6 +78,9 @@ public class AnalyseData {
 							&& curr.getTs() - prve.getTs() < SHIFT_TIME){
 						prve.setEnable(false);
 					}
+//					else if(curr.getInOut()){
+//						//curr.getTs() - prve.getTs() < 30000
+//					}
 				}
 				else{
 					//上下行的同名站，新走向的第一个出站信号开始有效
@@ -51,7 +51,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("ArrivalData_GPS,30,10");
-		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 10, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 40, 10, TimeUnit.SECONDS);
 	}
 	@Component
@@ -58,7 +58,7 @@ public class DataLoader {
 			PreparedStatement ps = null;
 			ResultSet rs = null;
-			String sql = "select * from bsth_c_arrival_info where weeks_year=? AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by ts";
+			String sql = "select * from bsth_c_arrival_info where weeks_year=? AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by create_date";
 			try{
 				long t = System.currentTimeMillis();
@@ -8,6 +8,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import com.bsth.data.match.Arrival2Schedule;
+import com.bsth.data.match.ExpectArrivalEnd;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
@@ -63,6 +65,26 @@ public class FirstScheduleCheckThread extends Thread{
 							&& Math.abs(first.getDfsjT() - t) < THREE_MINUTES){
 						directiveService.send60Dispatch(first, dayOfSchedule.doneSum(first.getClZbh()), "定补@系统");
+						//期望完成出场班次时间
+						long endTime;
+						
+						if(first.getZdsj() != null)
+							endTime=first.getZdsjT() - 60000;
+						else
+							endTime=schList.get(1).getDfsjT() - 60000;
+						
+						ExpectArrivalEnd ead = new ExpectArrivalEnd()
+									,ead2 = new ExpectArrivalEnd();
+						ead.setNbbm(car);
+						ead.setEndStation(first.getQdzCode());
+						ead.setEndTime(endTime);
+						
+						ead2.setNbbm(car);
+						ead2.setEndStation(first.getZdzCode());
+						ead2.setEndTime(endTime);
+						
+						Arrival2Schedule.addExpect(car, ead);
+						Arrival2Schedule.addExpect(car, ead2);
 					}
 				}
 			}
@@ -52,7 +52,7 @@ public class GatewayHttpUtils {
 			post.setEntity(new StringEntity(jsonStr, "utf-8"));
 			CloseableHttpResponse response = httpClient.execute(post);
-			
+
 			JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
 			if(null != json && json.getInteger("errCode") == 0)
 				code = 0;
 package com.bsth.data.forecast;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -9,6 +8,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,14 +40,14 @@ public class SampleTimeDataLoader extends Thread {
 	// 当天日期
 	String rq;
-	SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+	private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm")
+				,fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Override
 	public void run() {
-		SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
-		rq = sdfyyyyMMdd.format(new Date());
+		rq = fmtyyyyMMdd.print(new Date().getTime());
 		Iterator<Sample> iterator = sampleRepository.findAll().iterator();
 		ArrayListMultimap<String, Sample> sampleMap = ArrayListMultimap.create();
@@ -103,8 +104,9 @@ public class SampleTimeDataLoader extends Thread {
 			TimeRange tg;
 			for (Sample s : list) {
 				tg = new TimeRange();
-				tg.startTime = sdfyyyyMMddHHmm.parse(rq + s.getsDate()).getTime();
-				tg.endTime = sdfyyyyMMddHHmm.parse(rq + s.geteDate()).getTime();
+
+				tg.startTime = fmtyyyyMMddHHmm.parseMillis(rq + s.getsDate());
+				tg.endTime = fmtyyyyMMddHHmm.parseMillis(rq + s.geteDate());
 				tg.runTime = s.getRunTime();
 				simple.ranges.add(tg);
 			}
@@ -66,6 +66,10 @@ public class GpsEntity {
 	/** 是否异常数据 */
 	private boolean abnormal;
+	
+	private int valid;
+	
+	private int version;
 	public Integer getCompanyCode() {
 		return companyCode;
@@ -218,4 +222,20 @@ public class GpsEntity {
 	public void setAbnormal(boolean abnormal) {
 		this.abnormal = abnormal;
 	}
+
+	public int getValid() {
+		return valid;
+	}
+
+	public void setValid(int valid) {
+		this.valid = valid;
+	}
+
+	public int getVersion() {
+		return version;
+	}
+
+	public void setVersion(int version) {
+		this.version = version;
+	}
 }
@@ -34,7 +34,7 @@ import com.google.common.collect.TreeMultimap;
 /**
  * 
- * @ClassName: GpsRealEntityBuffer
+ * @ClassName: GpsRealData
  * @Description: TODO(实时GPS数据集合)
  * @author PanZhao
  * @date 2016年8月12日 下午2:04:41
@@ -73,7 +73,7 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("gpsDataLoader,20,6");
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
 package com.bsth.data.match;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -15,14 +14,17 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
+import com.bsth.data.LineConfigData;
 import com.bsth.data.arrival.ArrivalComparator;
 import com.bsth.data.arrival.ArrivalData_GPS;
 import com.bsth.data.arrival.ArrivalEntity;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.websocket.handler.SendUtils;
+import com.google.common.collect.ArrayListMultimap;
 /**
  * 
@@ -38,13 +40,14 @@ public class Arrival2Schedule implements ApplicationContextAware {
 	private static DayOfSchedule dayOfSchedule;
 	private static SendUtils sendUtils;
 	private static DirectiveService directiveService;
+	private static LineConfigData lineConfigData;
 	private final static int ONE_MINUTE = 1000 * 60;
 	//定一个4小时的范围，基本能对正常班次进行容错。主要防止早上停车场GPS飘导致完成晚上的进场班次
 	private final static int FOUR_HOURS = 1000 * 60 * 60 * 4;
 	private static Logger logger = LoggerFactory.getLogger(Arrival2Schedule.class);
-	private static Map<String, ExpectArrivalEnd> expectMap = new HashMap<>();
+	private static ArrayListMultimap<String, ExpectArrivalEnd> expectMap = ArrayListMultimap.create();
 	/**
 	 * 
@@ -61,6 +64,8 @@ public class Arrival2Schedule implements ApplicationContextAware {
 	public static class SchMatchThread extends Thread{
 		String nbbm;
+		LineConfig conf;
+		
 		public SchMatchThread(String nbbm){
 			this.nbbm = nbbm;
 		}
@@ -69,11 +74,11 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		private ScheduleComparator.FCSJ schComparator = new ScheduleComparator.FCSJ();
 		private ArrivalComparator arrComparator = new ArrivalComparator();
 		private MatchResultComparator mrComparator = new MatchResultComparator();
-		private SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-		
+
+		private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+
 		@Override
 		public void run() {
-				
 			//班次列表
 			List<ScheduleRealInfo> schList = dayOfSchedule.findByNbbm(nbbm);
 			//进出起终点数据
@@ -82,6 +87,7 @@ public class Arrival2Schedule implements ApplicationContextAware {
 			if(schList.size() == 0 || arrList.size() == 0)
 				return;
+			conf = lineConfigData.get(schList.get(0).getXlBm());
 			//排序
 			Collections.sort(schList, schComparator);
 			Collections.sort(arrList, arrComparator);
@@ -113,8 +119,8 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				if(sch.isDestroy())
 					continue;
-				//没有里程的不匹配
-				if(sch.getBcsj() == null && sch.getJhlc() == null)
+				//线路配置出站既出场，并且没有里程的不匹配
+				if(conf.getOutConfig()==2 && sch.getBcsj() == null && sch.getJhlc() == null)
 					continue;
 				list.add(sch);
@@ -194,7 +200,15 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				mr = new MatchResult();
 				mr.sch = sch;
 				mr.ts = inArr.getTs();
-				mr.diff = inArr.getTs() - sch.getZdsjT();
+				//班次没有里程和运送时间的
+				if(sch.getZdsj() == null){
+					if(i < schList.size()-1)
+						mr.diff = inArr.getTs() - schList.get(i + 1).getDfsjT();
+					else
+						mr.diff = inArr.getTs() - sch.getDfsjT();
+				}
+				else
+					mr.diff = inArr.getTs() - sch.getZdsjT();
 				mr.success = dayOfSchedule.validEndTime(sch, inArr.getTs());
 				if(Math.abs(mr.diff) < FOUR_HOURS && mr.success)
 					mrs.add(mr);
@@ -216,13 +230,8 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		public void carOut(MatchResult mr){
 			ScheduleRealInfo sch = mr.sch;
-			if(expectMap.containsKey(nbbm)){
-				ExpectArrivalEnd ead = expectMap.get(nbbm);
-				if(mr.ts < ead.getEndTime())
-					return;
-				else
-					expectMap.remove(nbbm);
-			}
+			if(!isExpectOut(mr))
+				return;
 			//设置发车时间
 			sch.setFcsjActualAll(mr.ts);
 			//通知客户端
@@ -231,8 +240,32 @@ public class Arrival2Schedule implements ApplicationContextAware {
 			dayOfSchedule.save(sch);
 			//车辆当前执行班次
 			dayOfSchedule.addExecPlan(sch);
+			
 			//期望车辆到达的终点
-			expectMap.put(nbbm, ExpectArrivalEnd.getEndInstance(sch, mr.ts));
+			if(sch.getZdsj() != null)
+				expectMap.put(nbbm, ExpectArrivalEnd.getEndInstance(sch, mr.ts));
+		}
+		
+		/**
+		 * 
+		 * @Title: isExpectOut 
+		 * @Description: TODO(是否是一个期望的出站匹配结果) 
+		 */
+		private boolean isExpectOut(MatchResult mr){
+			ScheduleRealInfo sch = mr.sch;
+			String nbbm = sch.getClZbh();
+			if(expectMap.containsKey(nbbm)){
+				List<ExpectArrivalEnd> eads = expectMap.get(nbbm);
+				for(ExpectArrivalEnd ead : eads){
+					if(sch.getQdzCode().equals(ead.getEndStation())
+							|| mr.ts > ead.getEndTime()){
+						expectMap.removeAll(nbbm);
+						return true;
+					}
+				}
+				return false;
+			}
+			return true;
 		}
 		/**
@@ -243,15 +276,8 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		public void carInStop(MatchResult mr){
 			ScheduleRealInfo sch = mr.sch;
 			String nbbm=sch.getClZbh();
-			if(expectMap.containsKey(nbbm)){
-				ExpectArrivalEnd ead = expectMap.get(nbbm);
-				if(mr.ts < ead.getEndTime() 
-						&& !mr.sch.getZdzCode().equals(ead.getEndStation())){
-					return;
-				}
-				else
-					expectMap.remove(nbbm);
-			}
+			if(!isExpectIn(mr))
+				return;
 			//如果是进停车场，并且实达时间差值大于 30 分钟，并且之前还有未完成班次。
 			if(sch.getBcType().equals("in") && Math.abs(mr.diff) > (1000 * 60 * 30)){
@@ -289,6 +315,28 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		/**
 		 * 
+		 * @Title: isExpectOut 
+		 * @Description: TODO(是否是一个期望的进站匹配结果) 
+		 */
+		private boolean isExpectIn(MatchResult mr){
+			ScheduleRealInfo sch = mr.sch;
+			String nbbm = sch.getClZbh();
+			if(expectMap.containsKey(nbbm)){
+				List<ExpectArrivalEnd> eads = expectMap.get(nbbm);
+				for(ExpectArrivalEnd ead : eads){
+					if(sch.getZdzCode().equals(ead.getEndStation())
+							|| mr.ts > ead.getEndTime()){
+						expectMap.removeAll(nbbm);
+						return true;
+					}
+				}
+				return false;
+			}
+			return true;
+		}
+		
+		/**
+		 * 
 		 * @Title: correctFirstSignal 
 		 * @Description: TODO(检查并纠正首班出场到离站) 
 		 */
@@ -342,8 +390,9 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				//上行发车，和到达时间比较一下。起点一般不会立即发出
 				if(mr.sch.getXlDir().equals("0") 
 						&& null != mr.sch.getQdzArrDateSJ()){
-					
-					long dt = sdfyyyyMMddHHmm.parse(mr.sch.getRealExecDate() + mr.sch.getQdzArrDateSJ()).getTime();
+
+
+					long dt = fmtyyyyMMddHHmm.parseMillis(mr.sch.getRealExecDate() + mr.sch.getQdzArrDateSJ());
 					//停站时间少于 计划的3分之1，标记为漂移信号
 					if((mr.ts - dt < (mr.sch.getDfsjT() - dt) / 3)){
@@ -367,6 +416,7 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		sendUtils = arg0.getBean(SendUtils.class);
 		dayOfSchedule = arg0.getBean(DayOfSchedule.class);
 		directiveService = arg0.getBean(DirectiveService.class);
+		lineConfigData = arg0.getBean(LineConfigData.class);
 	}
 	/**
@@ -376,6 +426,10 @@ public class Arrival2Schedule implements ApplicationContextAware {
 	 * @param @param nbbm   
 	 */
 	public void removeExpect(String nbbm){
-		expectMap.remove(nbbm);
+		expectMap.removeAll(nbbm);
+	}
+	
+	public static void addExpect(String nbbm, ExpectArrivalEnd eae){
+		expectMap.put(nbbm, eae);
 	}
 }
@@ -5,7 +5,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 /**
  * 
  * @ClassName: ExpectArrivalEnd 
- * @Description: TODO(期望车辆在某个时间段到达某个终点........) 
+ * @Description: TODO(期望车辆在某个时间段到达某个终点或 发出某个起点........) 
  * @author PanZhao 
  * @date 2016年11月2日 下午8:04:43 
  *
@@ -29,6 +29,7 @@ public class ExpectArrivalEnd {
 		}
 		return ead;
 	}
+	
 	public String getNbbm() {
 		return nbbm;
 package com.bsth.data.schedule;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -15,6 +13,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -115,14 +115,17 @@ public class DayOfSchedule implements CommandLineRunner {
 	@Autowired
 	ScheduleLateThread scheduleLateThread;
+	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd")
+				,fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
 	@Override
 	public void run(String... arg0) throws Exception {
 		//翻班线程
-		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 20, 240, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
 		//入库
-		//Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
 		//首班出场指令补发器
-		//Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 10, 120, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
 		//班次误点扫描
 		//Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
 	}
@@ -140,8 +143,7 @@ public class DayOfSchedule implements CommandLineRunner {
 		LineConfig conf = lineConfigData.get(lineCode);
 		long ct = System.currentTimeMillis();
-		SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
-		String schDate = sdfyyyyMMdd.format(new Date(ct));
+		String schDate = fmtyyyyMMdd.print(ct);
 		// 小于当天起始运营时间,则取前一天的排班
 		if (ct < conf.getCurrStartTime())
 			schDate = DateUtils.subtractDay(schDate, 1);
@@ -295,10 +297,8 @@ public class DayOfSchedule implements CommandLineRunner {
 		try {
 			Map<String, Object> data = new HashMap<>();
-			SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd")
-						,sdfHHmm = new SimpleDateFormat("HH:mm");
-			
-			data.put("scheduleDate_eq", sdfyyyyMMdd.parse(schDate));
+
+			data.put("scheduleDate_eq", fmtyyyyMMdd.parseDateTime(schDate).toDate());
 			data.put("xlBm_eq", lineCode);
 			// 查询计划排班
@@ -308,19 +308,14 @@ public class DayOfSchedule implements CommandLineRunner {
 			realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
 			for (ScheduleRealInfo sch : realList) {
-				sch.setScheduleDateStr(sdfyyyyMMdd.format(sch.getScheduleDate()));
+				sch.setScheduleDateStr(fmtyyyyMMdd.print(sch.getScheduleDate().getTime()));
 				sch.setRealExecDate(sch.getScheduleDateStr());
 				// 计划终点时间
 				if (sch.getBcsj() != null) {
-					try{
-						sch.setZdsjT(sdfHHmm.parse(sch.getFcsj()).getTime() + (sch.getBcsj() * 60 * 1000));
-						sch.setZdsj(sdfHHmm.format(sch.getZdsjT()));
-						sch.setLate(false);
-					}catch(ParseException pe){
-						logger.error("loadPlanSch... 计算终点时间失败...");
-					}
+					sch.setZdsj(fmtHHmm.print(fmtHHmm.parseMillis(sch.getFcsj()) + (sch.getBcsj() * 60 * 1000)));
+					sch.setLate(false);
 				}
-				//计划里程为0，直接清空
+				//计划里程为0，设置NULL
 				if(sch.getJhlc() != null && sch.getJhlc() == 0)
 					sch.setJhlc(null);
 			}
@@ -453,6 +448,7 @@ public class DayOfSchedule implements CommandLineRunner {
 	}
 	public void put(ScheduleRealInfo sch) {
+
 		schAttrCalculator
 			.calcRealDate(sch)
 			.calcAllTimeByFcsj(sch);
@@ -476,9 +472,9 @@ public class DayOfSchedule implements CommandLineRunner {
 		//return sch;
 	}
-	public void calcQdzTimePlan(String nbbm){
-		schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
-	}
+//	public void calcQdzTimePlan(String nbbm){
+//		schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
+//	}
 	public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm){
 		return schAttrCalculator.updateQdzTimePlan(nbbmScheduleMap.get(nbbm));
@@ -489,7 +485,7 @@ public class DayOfSchedule implements CommandLineRunner {
 	 * @Title: nextAll
 	 * @Description: TODO(之后的所有班次)
 	 */
-	public List<ScheduleRealInfo> nextAll(ScheduleRealInfo sch) {
+/*	public List<ScheduleRealInfo> nextAll(ScheduleRealInfo sch) {
 		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
 		// 排序
 		Collections.sort(list, schFCSJComparator);
@@ -503,7 +499,7 @@ public class DayOfSchedule implements CommandLineRunner {
 		}
 		return rs;
-	}
+	}*/
 	/**
 	 * 
@@ -595,7 +591,7 @@ public class DayOfSchedule implements CommandLineRunner {
 	public void save(ScheduleRealInfo sch){
 		//schRepository.save(sch);
-		//pstBuffer.add(sch);
+		pstBuffer.add(sch);
 	}
 package com.bsth.data.schedule;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +34,10 @@ public class SchAttrCalculator {
 	Logger logger = LoggerFactory.getLogger(this.getClass());
+	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd")
+			,fmtHHmm = DateTimeFormat.forPattern("HH:mm")
+			,fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+
 	/**
 	 * @Title: calcRealDate
 	 * @Description: TODO(计算班次的真实执行日期)
@@ -45,22 +49,12 @@ public class SchAttrCalculator {
 			if (null == sch.getFcsjT())
 				calcFcsjTime(sch);
-			SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
-			/*
-			 * 早于线路开始运营时间的，加一天
-			 * 如该线路 2点开始运营，2016-08-23的班次，则 2016-08-23 0:25 的班次应该调整成 2016-08-24 0:25
-			 
-			
-						,sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
-			long st = sdfyyyyMMddHHmm.parse(sch.getScheduleDateStr() + conf.getStartOpt()).getTime();
-			if (st > sch.getFcsjT()) 
-				sch.setFcsjAll(sch.getFcsjT() + DAY_TIME);*/
 			if(sch.getFcsj().compareTo(conf.getStartOpt()) < 0){
 				sch.setFcsjAll(sch.getFcsjT() + DAY_TIME);
 			}
-			sch.setRealExecDate(sdfyyyyMMdd.format(new Date(sch.getFcsjT())));
+			sch.setRealExecDate(fmtyyyyMMdd.print(sch.getFcsjT()));
 		} catch (Exception e) {
 			logger.error("", e);
 		}
@@ -77,12 +71,10 @@ public class SchAttrCalculator {
 			// 生成时间戳
 			calcTimestamp(sch);
-			SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 			// 计划终点时间
 			if (sch.getBcsj() != null) {
-				Date zdDate = new Date(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
-				sch.setZdsjT(zdDate.getTime());
-				sch.setZdsj(sdfHHmm.format(zdDate));
+				sch.setZdsjT(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
+				sch.setZdsj(fmtHHmm.print(sch.getZdsjT()));
 			}
 		} catch (ParseException e) {
 			logger.error("", e);
@@ -178,8 +170,7 @@ public class SchAttrCalculator {
 	}
 	public SchAttrCalculator calcFcsjTime(ScheduleRealInfo sch) throws ParseException {
-		SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-		sch.setFcsjT(sdfyyyyMMddHHmm.parse(sch.getRealExecDate() + sch.getFcsj()).getTime());
+		sch.setFcsjT(fmtyyyyMMddHHmm.parseMillis(sch.getRealExecDate() + sch.getFcsj()));
 		return this;
 	}
@@ -18,7 +18,7 @@ import com.bsth.entity.realcontrol.LineConfig;
 /**
  * 
- * @ClassName: refreshScheduleThread
+ * @ClassName: ScheduleRefreshThread
  * @Description: TODO(班次刷新线程，用于在营运开始时间切换到当日排班)
  * @author PanZhao
  * @date 2016年8月17日 下午1:23:34
@@ -72,6 +72,7 @@ public class ScheduleRefreshThread extends Thread{
 					logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
 				}
 			}
+			
 		} catch (Exception e) {
 			logger.error("", e);
 		}
@@ -116,6 +116,12 @@ public class Line implements Serializable {
 	/** 普通车辆数量   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
 	private Integer ordCarNumber;
+	/** 权证车辆数量  报表需要的字段值 */
+	private Integer warrantCar;
+	
+	/** 权证配车启用日期  报表需要的字段值 */
+	private Integer warrantDate;
+	
 	/** 停车场编码   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
 	private String carParkCode;
@@ -139,6 +145,22 @@ public class Line implements Serializable {
 	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
+	public Integer getWarrantCar() {
+		return warrantCar;
+	}
+
+	public void setWarrantCar(Integer warrantCar) {
+		this.warrantCar = warrantCar;
+	}
+
+	public Integer getWarrantDate() {
+		return warrantDate;
+	}
+
+	public void setWarrantDate(Integer warrantDate) {
+		this.warrantDate = warrantDate;
+	}
+
 	public Integer getLinePlayType() {
 		return linePlayType;
 	}
@@ -17,251 +17,276 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 /**
- * 
- * @ClassName: D60 
- * @Description: TODO(调度指令) 
  * @author PanZhao
- * @date 2016年6月7日 上午10:21:59 
- *
+ * @ClassName: D60
+ * @Description: TODO(调度指令)
+ * @date 2016年6月7日 上午10:21:59
  */
 @Entity
 @Table(name = "bsth_v_directive_60")
 @NamedEntityGraphs({
-	@NamedEntityGraph(name = "directive60_sch", attributeNodes = {
-			@NamedAttributeNode("sch")
-	})
+        @NamedEntityGraph(name = "directive60_sch", attributeNodes = {
+                @NamedAttributeNode("sch")
+        })
 })
-public class D60 extends Directive{
+public class D60 extends Directive {
-	@Id
+    @Id
     @GeneratedValue
-	private Integer id;
-	
-	/**
-	 * 数据
-	 */
-	private D60Data data;
-	
-	/**
-	 * 唯一标识
-	 */
-	@Transient
-	private Integer msgId;
-	
-	/**
-	 * 46上行
-	 */
-	private Short reply46 = -1;
-	
-	/**
-	 * 47上行
-	 */
-	private Short reply47 = -1;
-	
-	/**
-	 * 是否是调度指令
-	 * 目前调度指令和消息短语都是短语下发，所以从协议上无法区分
-	 */
-	private boolean isDispatch;
-	
-	/**
-	 * 相关联的班次
-	 */
-	@JsonIgnore
-	@ManyToOne(fetch = FetchType.LAZY)
-	private ScheduleRealInfo sch;
-	
-	@Embeddable
-	public static class D60Data {
-		// 公司代码
-		private short companyCode;
-
-		// 设备号
-		@Transient
-		private String deviceId;
-
-		// 时间戳
-		@Transient
-		private Long timestamp;
-
-		// 保留 默认0
-		private short instructType = 0;
-
-		/*
-		 * 调度指令 调度指令。
-		 *  0X00表示信息短语 
-		 *  0X01表示取消上次指令+调度指令(闹钟有效) 
-		 *  0x02表示为调度指令(闹钟有效)
-		 *  0x03表示运营状态指令(闹钟无效) 
-		 *  0x04表示其他指令
-		 */
-		private Short dispatchInstruct;
-
-		// 唯一标识
-		private int msgId;
-
-		// 闹钟
-		private Long alarmTime;
-
-		// 多个运营状态字节
-		private Long serviceState;
-
-		// 消息文本
-		private String txtContent;
-
-		public short getCompanyCode() {
-			return companyCode;
-		}
-
-		public void setCompanyCode(short companyCode) {
-			this.companyCode = companyCode;
-		}
-
-		public String getDeviceId() {
-			return deviceId;
-		}
-
-		public void setDeviceId(String deviceId) {
-			this.deviceId = deviceId;
-		}
-
-		public Long getTimestamp() {
-			return timestamp;
-		}
-
-		public void setTimestamp(Long timestamp) {
-			this.timestamp = timestamp;
-		}
-
-		public short getInstructType() {
-			return instructType;
-		}
-
-		public void setInstructType(short instructType) {
-			this.instructType = instructType;
-		}
-
-		public Short getDispatchInstruct() {
-			return dispatchInstruct;
-		}
-
-		public void setDispatchInstruct(Short dispatchInstruct) {
-			this.dispatchInstruct = dispatchInstruct;
-		}
-
-		public int getMsgId() {
-			return msgId;
-		}
-
-		public void setMsgId(int msgId) {
-			this.msgId = msgId;
-		}
-
-		public Long getAlarmTime() {
-			return alarmTime;
-		}
-
-		public void setAlarmTime(Long alarmTime) {
-			this.alarmTime = alarmTime;
-		}
-
-		public Long getServiceState() {
-			return serviceState;
-		}
-
-		public void setServiceState(Long serviceState) {
-			this.serviceState = serviceState;
-		}
-
-		public String getTxtContent() {
-			return txtContent;
-		}
-
-		public void setTxtContent(String txtContent) {
-			this.txtContent = txtContent;
-		}
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public short getOperCode() {
-		return operCode;
-	}
-
-	public void setOperCode(short operCode) {
-		this.operCode = operCode;
-	}
-
-	public D60Data getData() {
-		return data;
-	}
-
-	public void setData(D60Data data) {
-		this.data = data;
-	}
-
-	public Integer getMsgId() {
-		if(this.msgId != null)
-			return this.msgId;
-		else
-			return this.getData().getMsgId();
-	}
-
-	public void setMsgId(Integer msgId) {
-		this.msgId = msgId;
-	}
-	
-	@Override
-	public void setTimestamp(Long timestamp) {
-		if(this.data != null)
-			this.data.setTimestamp(timestamp);
-		
-		this.timestamp = timestamp;
-	}
-	
-	@Override
-	public void setDeviceId(String deviceId) {
-		if(this.data != null)
-			this.data.setDeviceId(deviceId);
-		
-		this.deviceId = deviceId;
-	}
-
-	public Short getReply46() {
-		return reply46;
-	}
-
-	public void setReply46(Short reply46) {
-		this.reply46 = reply46;
-	}
-
-	public Short getReply47() {
-		return reply47;
-	}
-
-	public void setReply47(Short reply47) {
-		this.reply47 = reply47;
-	}
-
-	public boolean isDispatch() {
-		return isDispatch;
-	}
-
-	public void setDispatch(boolean isDispatch) {
-		this.isDispatch = isDispatch;
-	}
-
-	public ScheduleRealInfo getSch() {
-		return sch;
-	}
-
-	public void setSch(ScheduleRealInfo sch) {
-		this.sch = sch;
-	}
+    private Integer id;
+
+    /**
+     * 数据
+     */
+    private D60Data data;
+
+    /**
+     * 唯一标识
+     */
+    @Transient
+    private Integer msgId;
+
+    /**
+     * 46上行
+     */
+    private Short reply46 = -1;
+    /**
+     * 46收到时间
+     */
+    private Long reply46Time;
+
+    /**
+     * 47上行
+     */
+    private Short reply47 = -1;
+
+    /**
+     * 47收到时间
+     */
+    private Long reply47Time;
+
+    /**
+     * 是否是调度指令
+     * 目前调度指令和消息短语都是短语下发，所以从协议上无法区分
+     */
+    private boolean isDispatch;
+
+    /**
+     * 相关联的班次
+     */
+    @JsonIgnore
+    @ManyToOne(fetch = FetchType.LAZY)
+    private ScheduleRealInfo sch;
+
+    public Long getReply46Time() {
+        return reply46Time;
+    }
+
+    public void setReply46Time(Long reply46Time) {
+        this.reply46Time = reply46Time;
+    }
+
+    public Long getReply47Time() {
+        return reply47Time;
+    }
+
+    public void setReply47Time(Long reply47Time) {
+        this.reply47Time = reply47Time;
+    }
+
+    @Embeddable
+    public static class D60Data {
+        // 公司代码
+        private short companyCode;
+
+        // 设备号
+        @Transient
+        private String deviceId;
+
+        // 时间戳
+        @Transient
+        private Long timestamp;
+
+        // 保留 默认0
+        private short instructType = 0;
+
+        /*
+         * 调度指令 调度指令。
+         *  0X00表示信息短语
+         *  0X01表示取消上次指令+调度指令(闹钟有效)
+         *  0x02表示为调度指令(闹钟有效)
+         *  0x03表示运营状态指令(闹钟无效)
+         *  0x04表示其他指令
+         */
+        private Short dispatchInstruct;
+
+        // 唯一标识
+        private int msgId;
+
+        // 闹钟
+        private Long alarmTime;
+
+        // 多个运营状态字节
+        private Long serviceState;
+
+        // 消息文本
+        private String txtContent;
+
+        public short getCompanyCode() {
+            return companyCode;
+        }
+
+        public void setCompanyCode(short companyCode) {
+            this.companyCode = companyCode;
+        }
+
+        public String getDeviceId() {
+            return deviceId;
+        }
+
+        public void setDeviceId(String deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        public Long getTimestamp() {
+            return timestamp;
+        }
+
+        public void setTimestamp(Long timestamp) {
+            this.timestamp = timestamp;
+        }
+
+        public short getInstructType() {
+            return instructType;
+        }
+
+        public void setInstructType(short instructType) {
+            this.instructType = instructType;
+        }
+
+        public Short getDispatchInstruct() {
+            return dispatchInstruct;
+        }
+
+        public void setDispatchInstruct(Short dispatchInstruct) {
+            this.dispatchInstruct = dispatchInstruct;
+        }
+
+        public int getMsgId() {
+            return msgId;
+        }
+
+        public void setMsgId(int msgId) {
+            this.msgId = msgId;
+        }
+
+        public Long getAlarmTime() {
+            return alarmTime;
+        }
+
+        public void setAlarmTime(Long alarmTime) {
+            this.alarmTime = alarmTime;
+        }
+
+        public Long getServiceState() {
+            return serviceState;
+        }
+
+        public void setServiceState(Long serviceState) {
+            this.serviceState = serviceState;
+        }
+
+        public String getTxtContent() {
+            return txtContent;
+        }
+
+        public void setTxtContent(String txtContent) {
+            this.txtContent = txtContent;
+        }
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public short getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(short operCode) {
+        this.operCode = operCode;
+    }
+
+    public D60Data getData() {
+        return data;
+    }
+
+    public void setData(D60Data data) {
+        this.data = data;
+    }
+
+    public Integer getMsgId() {
+        if (this.msgId != null)
+            return this.msgId;
+        else
+            return this.getData().getMsgId();
+    }
+
+    public void setMsgId(Integer msgId) {
+        this.msgId = msgId;
+    }
+
+    @Override
+    public void setTimestamp(Long timestamp) {
+        if (this.data != null)
+            this.data.setTimestamp(timestamp);
+
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public void setDeviceId(String deviceId) {
+        if (this.data != null)
+            this.data.setDeviceId(deviceId);
+
+        this.deviceId = deviceId;
+    }
+
+    public Short getReply46() {
+        return reply46;
+    }
+
+    public void setReply46(Short reply46) {
+        this.reply46 = reply46;
+    }
+
+    public Short getReply47() {
+        return reply47;
+    }
+
+    public void setReply47(Short reply47) {
+        this.reply47 = reply47;
+    }
+
+    public boolean isDispatch() {
+        return isDispatch;
+    }
+
+    public void setDispatch(boolean isDispatch) {
+        this.isDispatch = isDispatch;
+    }
+
+    public ScheduleRealInfo getSch() {
+        return sch;
+    }
+
+    public void setSch(ScheduleRealInfo sch) {
+        this.sch = sch;
+    }
+
+
 }
 package com.bsth.entity.directive;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 /**
  * 
@@ -41,6 +36,7 @@ public class DC0_A3 extends Directive{
 		/** 定时定距上报模式 */
 		private short reportMode;
 		/** 定时上报时间间隔 */
+		@Column(name = "_interval")
 		private int interval;
 		/** 定距上报距离间隔 */
 		private String distance; 
 package com.bsth.entity.directive;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 /**
  * 
@@ -41,6 +36,7 @@ public class DC0_A4 extends Directive{
 		/** 定时定距上报模式 */
 		private short reportMode;
 		/** 定时上报时间间隔 */
+		@Column(name = "_interval")
 		private int interval;
 		/** 定距上报距离间隔 */
 		private String distance; 
@@ -6,9 +6,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.*;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -507,31 +507,28 @@ public class ScheduleRealInfo {
 	public void setDfsjT(Long dfsjT) {
 		this.dfsjT = dfsjT;
 	}
-	
+
+
+	@Transient
+	private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+	@Transient
+	private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+
 	public void setDfsjAll(Long dfsjT) {
 		this.dfsjT = dfsjT;
-		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
-		this.dfsj = sdfHHmm.format(new Date(this.dfsjT));
+		this.dfsj = fmtHHmm.print(this.dfsjT);
 	}
 	public void setDfsjAll(String dfsj) {
-		
-		try {
-			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-			this.dfsjT = sdfyyyyMMddHHmm.parse(this.realExecDate + dfsj).getTime();
-			this.dfsj = dfsj;
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
+		this.dfsjT = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + dfsj);
+		this.dfsj = dfsj;
 	}
 	public void calcEndTime(){
 		//计划终点时间
-		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 		if(this.getBcsj() != null){
-			Date zdDate = new Date(this.getDfsjT() + (this.getBcsj() * 60 * 1000));
-			this.setZdsjT(zdDate.getTime());
-			this.setZdsj(sdfHHmm.format(zdDate));
+			this.setZdsjT(this.getDfsjT() + (this.getBcsj() * 60 * 1000));
+			this.setZdsj(fmtHHmm.print(this.zdsjT));
 		}
 	}
@@ -583,13 +580,8 @@ public class ScheduleRealInfo {
 	 * @throws
 	 */
 	public void setFcsjAll(String fcsj){
-		try {
-			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-			this.fcsjT = sdfyyyyMMddHHmm.parse(this.realExecDate + fcsj).getTime();
-			this.fcsj = fcsj;
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
+		this.fcsjT = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + fcsj);
+		this.fcsj = fcsj;
 	}
 	/**
@@ -600,8 +592,7 @@ public class ScheduleRealInfo {
 	 */
 	public void setFcsjAll(Long fcsjT){
 		this.fcsjT = fcsjT;
-		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
-		this.fcsj = sdfHHmm.format(new Date(fcsjT));
+		this.fcsj = fmtHHmm.print(fcsjT);
 	}
 	/**
@@ -611,15 +602,9 @@ public class ScheduleRealInfo {
 	 * @throws
 	 */
 	public void setFcsjActualAll(String fcsjActual){
-		try {
-			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-			this.fcsjActualTime = sdfyyyyMMddHHmm.parse(this.realExecDate + fcsjActual).getTime();
-			this.fcsjActual = fcsjActual;
-			
-			calcStatus();
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
+		this.fcsjActualTime = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + fcsjActual);
+		this.fcsjActual = fcsjActual;
+		calcStatus();
 	}
 	/**
@@ -630,9 +615,8 @@ public class ScheduleRealInfo {
 	 */
 	public void setFcsjActualAll(Long t){
 		this.fcsjActualTime = t;
-		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
-		this.fcsjActual = sdfHHmm.format(new Date(t));
-		
+		this.fcsjActual = fmtHHmm.print(t);
+
 		//更新班次状态
 		calcStatus();
 	}
@@ -645,12 +629,10 @@ public class ScheduleRealInfo {
 	 */
 	public void setZdsjActualAll(Long t){
 		this.zdsjActualTime = t;
-		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
-		this.zdsjActual = sdfHHmm.format(new Date(t));
+		this.zdsjActual = fmtHHmm.print(t);
 		//更新班次状态
 		calcStatus();
-		//this.synchroZdsj();
 	}
 	/**
@@ -660,15 +642,10 @@ public class ScheduleRealInfo {
 	 * @throws
 	 */
 	public void setZdsjActualAll(String zdsjActual){
-		try {
-			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-			this.zdsjActualTime = sdfyyyyMMddHHmm.parse(this.realExecDate + zdsjActual).getTime();
-			this.zdsjActual = zdsjActual;
-			
-			calcStatus();
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
+		this.zdsjActualTime = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + zdsjActual);
+		this.zdsjActual = zdsjActual;
+
+		calcStatus();
 	}
 	public Long getSpId() {
@@ -713,17 +690,17 @@ public class ScheduleRealInfo {
 		return this.status == -1;
 	}
-	public boolean isNotDestroy(){
+/*	public boolean isNotDestroy(){
 		return this.status != -1;
-	}
+	}*/
 	public Set<ChildTaskPlan> getcTasks() {
 		return cTasks;
 	}
-	public void setcTasks(Set<ChildTaskPlan> cTasks) {
+/*	public void setcTasks(Set<ChildTaskPlan> cTasks) {
 		this.cTasks = cTasks;
-	}
+	}*/
 	public String getScheduleDateStr() {
 		return scheduleDateStr;
 package com.bsth.service.directive;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -11,6 +10,8 @@ import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,7 +74,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 	@Autowired
 	DayOfSchedule dayOfSchedule;
-	static Long schDiff = 1000 * 60 * 60L;
+	//static Long schDiff = 1000 * 60 * 60L;
+
+	private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm")
+				,fmtHHmm_CN = DateTimeFormat.forPattern("HH点mm分");
 	@Override
 	public int send60Phrase(String nbbm, String text, String sender) {
@@ -111,10 +115,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 				logger.warn("烂班不允许发送调度指令....");
 				return -1;
 			}
-			//多线程下发指令时，SimpleDateFormat必须方法内初始化
-			SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH点mm分");
-			
-			String text = "已完成" + finish + "个班次，下一发车时间" + sdfHHmm.format(new Date(sch.getDfsjT())) + "，由"
+			String text = "已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
 					+ sch.getQdzName() + "发往" + sch.getZdzName();
 			//下发0x02指令  调度指令(闹钟有效)
@@ -168,7 +169,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 	@Override
 	public void sendD60ToPage(ScheduleRealInfo sch) {
 		Map<String, Object> map = new HashMap<>();
-		map.put("fn", sch);
+		map.put("fn", "directive");
 		map.put("t", sch);
 		ObjectMapper mapper = new ObjectMapper();
@@ -402,11 +403,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		List<Directive> rs = list.subList(s, e);
-		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 		// 时间格式化，车辆自编号转换
 		for (Directive d : rs) {
 			if (d.getTimeHHmm() == null)
-				d.setTimeHHmm(sdfHHmm.format(new Date(d.getTimestamp())));
+				d.setTimeHHmm(fmtHHmm.print(d.getTimestamp()));
 			if (d.getNbbm() == null)
 				d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
 		}
@@ -455,10 +455,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		if (e > count)
 			e = count;
-		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+		//SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 		List<D80> rs = d80s.subList(s, e);
 		for(D80 d80 : rs){
-			d80.setTimeStr(sdfHHmm.format(new Date(d80.getTimestamp())));
+			d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
 		}
 		Map<String, Object> rsMap = new HashMap<>();
@@ -33,7 +33,7 @@ public class SchedulePlanInfoServiceImpl extends BaseServiceImpl&lt;SchedulePlanInf
     @Transactional
     public int updateGroupInfo(GroupInfoUpdate groupInfoUpdate) {
         int type = groupInfoUpdate.getType();
-        int result;
+        int result = 0;
         if (type == 1) {
             // 换车
             if (groupInfoUpdate.getUpdate().getClId() != groupInfoUpdate.getSrc().getClId()) {
@@ -128,6 +128,6 @@ public class SchedulePlanInfoServiceImpl extends BaseServiceImpl&lt;SchedulePlanInf
             throw new RuntimeException("未知的更新类型，type=" + type);
         }
-        return 0;
+        return result;
     }
 }
@@ -127,8 +127,8 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
         DateTime today = new DateTime(new Date());
         DateTime tommorw = new DateTime(today.getYear(), today.getMonthOfYear(), today.getDayOfMonth(), 0, 0).plusDays(1);
         Map<String, Object> param = new HashMap<>();
-        param.put("scheduleFromTime_le", tommorw);
-        param.put("scheduleToTime_ge", tommorw);
+        param.put("scheduleFromTime_le", tommorw.toDate());
+        param.put("scheduleToTime_ge", tommorw.toDate()     );
         Iterator<SchedulePlan> schedulePlanIterator = this.list(param).iterator();
         if (schedulePlanIterator.hasNext()) {
             return schedulePlanIterator.next();
@@ -3,6 +3,7 @@ package com.bsth.websocket.handler;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -83,7 +84,7 @@ public class RealControlSocketHandler implements WebSocketHandler {
 		default:
 			break;
 		}
-		System.out.println(msg);
+		logger.info(msg.getPayload().toString());
 	}
 	@Override
@@ -104,7 +105,7 @@ public class RealControlSocketHandler implements WebSocketHandler {
 	 * 给所有在线用户发送消息
 	 *
 	 * @param message
-	 */
+	 
 	public synchronized void sendMessageToUsers(TextMessage message) {
 		for (WebSocketSession user : users) {
 			try {
@@ -115,14 +116,14 @@ public class RealControlSocketHandler implements WebSocketHandler {
 				e.printStackTrace();
 			}
 		}
-	}
+	}*/
 	/**
 	 * 给某些用户发送消息
 	 *
 	 * @param userId
 	 * @param message
-	 */
+	 
 	public synchronized void sendMessageToUser(Set<String> uids, String msg) {
 		TextMessage message = new TextMessage(msg.getBytes());
 		for (WebSocketSession user : users) {
@@ -136,31 +137,29 @@ public class RealControlSocketHandler implements WebSocketHandler {
 				}
 			}
 		}
-	}
+	}*/
 	/**
 	 * 根据线路推送消息
-	 *
-	 * @param userId
-	 * @param message
 	 */
 	public synchronized void sendMessageToLine(String lineCode, String msg) {
-		//Set<String> uids = BasicData.lineCode2SocketUserMap.get(lineCode);
-		//if(null == uids || uids.size() == 0)
-		//	return;
 		TextMessage message = new TextMessage(msg.getBytes());
-		List<WebSocketSession> sessList = listenMap.get(lineCode);
+		Iterator<WebSocketSession> iterator = listenMap.get(lineCode).iterator();
-		for (WebSocketSession user : sessList) {
+		WebSocketSession user;
+		while(iterator.hasNext()){
+			user = iterator.next();
 			try {
 				if (user.isOpen()) {
 					user.sendMessage(message);
 				}
-			} catch (IOException e) {
+			} catch (Exception e) {
+				logger.error("sendMessageToLine error ...."+msg);
 				logger.error("sendMessageToLine error ....", e);
 			}
+			
 		}
 	}
 }
@@ -6,9 +6,9 @@ spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
-spring.jpa.show-sql= true
+spring.jpa.show-sql= false
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201:3306/mh_control
+spring.datasource.url= jdbc:mysql://192.168.168.201:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
 spring.datasource.password= 123456
 #DATASOURCE
@@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.40.100:3306/qp_control
+spring.datasource.url= jdbc:mysql://192.168.40.100:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
 spring.datasource.password= root@JSP2jsp
 #DATASOURCE
 #ms.mysql.driver= com.mysql.jdbc.Driver
-#ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8
+#ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #ms.mysql.username= root
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
 ms.mysql.username= root
 ms.mysql.password= 123456
+!function(a){"use strict";var b=a.HTMLCanvasElement&&a.HTMLCanvasElement.prototype,c=a.Blob&&function(){try{return Boolean(new Blob)}catch(a){return!1}}(),d=c&&a.Uint8Array&&function(){try{return 100===new Blob([new Uint8Array(100)]).size}catch(a){return!1}}(),e=a.BlobBuilder||a.WebKitBlobBuilder||a.MozBlobBuilder||a.MSBlobBuilder,f=(c||e)&&a.atob&&a.ArrayBuffer&&a.Uint8Array&&function(a){var b,f,g,h,i,j;for(b=a.split(",")[0].indexOf("base64")>=0?atob(a.split(",")[1]):decodeURIComponent(a.split(",")[1]),f=new ArrayBuffer(b.length),g=new Uint8Array(f),h=0;h<b.length;h+=1)g[h]=b.charCodeAt(h);return i=a.split(",")[0].split(":")[1].split(";")[0],c?new Blob([d?g:f],{type:i}):(j=new e,j.append(f),j.getBlob(i))};a.HTMLCanvasElement&&!b.toBlob&&(b.mozGetAsFile?b.toBlob=function(a,c,d){a(d&&b.toDataURL&&f?f(this.toDataURL(c,d)):this.mozGetAsFile("blob",c))}:b.toDataURL&&f&&(b.toBlob=function(a,b,c){a(f(this.toDataURL(b,c)))})),"function"==typeof define&&define.amd?define(function(){return f}):a.dataURLtoBlob=f}(window);
 \ No newline at end of file
+/*!
+ * bootstrap-fileinput v4.3.6
+ * http://plugins.krajee.com/file-input
+ *
+ * Author: Kartik Visweswaran
+ * Copyright: 2014 - 2016, Kartik Visweswaran, Krajee.com
+ *
+ * Licensed under the BSD 3-Clause
+ * https://github.com/kartik-v/bootstrap-fileinput/blob/master/LICENSE.md
+ */.file-loading{top:0;right:0;width:25px;height:25px;font-size:999px;text-align:right;color:#fff;background:transparent url('../img/loading.gif') top left no-repeat;border:0}.file-object{margin:0 0 -5px 0;padding:0}.btn-file{position:relative;overflow:hidden}.btn-file input[type=file]{position:absolute;top:0;right:0;min-width:100%;min-height:100%;text-align:right;opacity:0;background:none repeat scroll 0 0 transparent;cursor:inherit;display:block}.file-caption-name{display:inline-block;overflow:hidden;height:20px;word-break:break-all}.input-group-lg .file-caption-name{height:25px}.file-zoom-dialog{text-align:left}.file-error-message{color:#a94442;background-color:#f2dede;margin:5px;border:1px solid #ebccd1;border-radius:4px;padding:15px}.file-error-message pre,.file-error-message ul{margin:0;text-align:left}.file-error-message pre{margin:5px 0}.file-caption-disabled{background-color:#eee;cursor:not-allowed;opacity:1}.file-preview{border-radius:5px;border:1px solid #ddd;padding:5px;width:100%;margin-bottom:5px}.file-preview-frame{position:relative;display:table;margin:8px;height:160px;border:1px solid #ddd;box-shadow:1px 1px 5px 0 #a2958a;padding:6px;float:left;text-align:center;vertical-align:middle}.file-preview-frame:not(.file-preview-error):hover{box-shadow:3px 3px 5px 0 #333}.file-preview-image{vertical-align:middle;image-orientation:from-image}.file-preview-text{display:block;color:#428bca;border:1px solid #ddd;font-family:Menlo,Monaco,Consolas,"Courier New",monospace;outline:0;padding:8px;resize:none}.file-preview-html{border:1px solid #ddd;padding:8px;overflow:auto}.file-zoom-dialog .file-preview-text{font-size:1.2em}.file-preview-other{left:0;top:0;right:0;bottom:0;margin:auto;text-align:center;vertical-align:middle;padding:10px}.file-preview-other:hover{opacity:.8}.file-actions,.file-other-error{text-align:left}.file-other-icon{font-size:4.8em}.file-zoom-dialog .file-other-icon{font-size:8em;font-size:55vmin}.file-input-new .file-preview,.file-input-new .close,.file-input-new .glyphicon-file,.file-input-new .fileinput-remove-button,.file-input-new .fileinput-upload-button,.file-input-ajax-new .fileinput-remove-button,.file-input-ajax-new .fileinput-upload-button{display:none}.file-caption-main{width:100%}.file-input-ajax-new .no-browse .input-group-btn,.file-input-new .no-browse .input-group-btn{display:none}.file-input-ajax-new .no-browse .form-control,.file-input-new .no-browse .form-control{border-top-right-radius:4px;border-bottom-right-radius:4px}.file-thumb-loading{background:transparent url('../img/loading.gif') no-repeat scroll center center content-box!important}.file-actions{margin-top:15px}.file-footer-buttons{float:right}.file-upload-indicator{display:inline;cursor:default;opacity:.8;width:60%}.file-upload-indicator:hover{font-weight:bold;opacity:1}.file-footer-caption{display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:160px;text-align:center;padding-top:4px;font-size:11px;color:#777;margin:5px auto}.file-preview-error{opacity:.65;box-shadow:none}.file-preview-frame:not(.file-preview-error) .file-footer-caption:hover{color:#000}.file-drop-zone{border:1px dashed #aaa;border-radius:4px;height:100%;text-align:center;vertical-align:middle;margin:12px 15px 12px 12px;padding:5px}.file-drop-zone-title{color:#aaa;font-size:1.6em;padding:85px 10px;cursor:default}.file-preview .clickable,.clickable .file-drop-zone-title{cursor:pointer}.file-drop-zone.clickable:hover{border:2px dashed #999}.file-drop-zone.clickable:focus{border:2px solid #5acde2}.file-drop-zone .file-preview-thumbnails{cursor:default}.file-highlighted{border:2px dashed #999!important;background-color:#f0f0f0}.file-uploading{background:url('../img/loading-sm.gif') no-repeat center bottom 10px;opacity:.65}.file-thumb-progress{height:10px}.file-thumb-progress .progress,.file-thumb-progress .progress-bar{height:10px;font-size:9px;line-height:10px}.file-thumbnail-footer{position:relative}.file-thumb-progress{position:absolute;top:35px;left:0;right:0}.file-zoom-fullscreen.modal{position:fixed;top:0;right:0;bottom:0;left:0}.file-zoom-fullscreen .modal-dialog{position:fixed;margin:0;width:100%;height:100%;padding:0}.file-zoom-fullscreen .modal-content{border-radius:0;box-shadow:none}.file-zoom-fullscreen .modal-body{overflow-y:auto}.file-zoom-dialog .modal-body{position:relative!important}.file-zoom-dialog .btn-navigate{position:absolute;padding:0;margin:0;background:transparent;text-decoration:none;outline:0;opacity:.7;top:45%;font-size:4em;color:#1c94c4}.file-zoom-dialog .floating-buttons{position:absolute;top:5px;right:10px}.floating-buttons,.floating-buttons .btn{z-index:3000}.file-zoom-dialog .kv-zoom-actions .btn,.floating-buttons .btn{margin-left:3px}.file-zoom-dialog .btn-navigate:not([disabled]):hover,.file-zoom-dialog .btn-navigate:not([disabled]):focus{outline:0;box-shadow:none;opacity:.5}.file-zoom-dialog .btn-navigate[disabled]{opacity:.3}.file-zoom-dialog .btn-prev{left:1px}.file-zoom-dialog .btn-next{right:1px}.file-drag-handle{display:inline;margin-right:2px;font-size:16px;cursor:move;cursor:-webkit-grabbing}.file-drag-handle:hover{opacity:.7}.file-zoom-content{height:480px;text-align:center}.file-preview-initial.sortable-chosen{background-color:#d9edf7}.file-preview-frame.sortable-ghost{background-color:#eee}.btn-file ::-ms-browse{width:100%;height:100%}
 \ No newline at end of file
+/*!
+ * bootstrap-fileinput v4.3.6
+ * http://plugins.krajee.com/file-input
+ *
+ * Author: Kartik Visweswaran
+ * Copyright: 2014 - 2016, Kartik Visweswaran, Krajee.com
+ *
+ * Licensed under the BSD 3-Clause
+ * https://github.com/kartik-v/bootstrap-fileinput/blob/master/LICENSE.md
+ */!function(a){"use strict";"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(window.jQuery)}(function(a){"use strict";a.fn.fileinputLocales={},a.fn.fileinputThemes={};var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,$,_,aa,ba,ca,da,ea,fa,ga,ha,ia,ja,ka,la,ma,na,oa;b=".fileinput",c="kvFileinputModal",d='style="width:{width};height:{height};"',e='<param name="controller" value="true" />\n<param name="allowFullScreen" value="true" />\n<param name="allowScriptAccess" value="always" />\n<param name="autoPlay" value="false" />\n<param name="autoStart" value="false" />\n<param name="quality" value="high" />\n',f='<div class="file-preview-other">\n<span class="{previewFileIconClass}">{previewFileIcon}</span>\n</div>',g=window.URL||window.webkitURL,h=function(a,b,c){return void 0!==a&&(c?a===b:a.match(b))},i=function(a){if("Microsoft Internet Explorer"!==navigator.appName)return!1;if(10===a)return new RegExp("msie\\s"+a,"i").test(navigator.userAgent);var c,b=document.createElement("div");return b.innerHTML="<!--[if IE "+a+"]> <i></i> <![endif]-->",c=b.getElementsByTagName("i").length,document.body.appendChild(b),b.parentNode.removeChild(b),c},j=function(a,c,d,e){var f=e?c:c.split(" ").join(b+" ")+b;a.off(f).on(f,d)},k={data:{},init:function(a){var b=a.initialPreview,c=a.id;b.length>0&&!ea(b)&&(b=b.split(a.initialPreviewDelimiter)),k.data[c]={content:b,config:a.initialPreviewConfig,tags:a.initialPreviewThumbTags,delimiter:a.initialPreviewDelimiter,previewFileType:a.initialPreviewFileType,previewAsData:a.initialPreviewAsData,template:a.previewGenericTemplate,showZoom:a.fileActionSettings.showZoom,showDrag:a.fileActionSettings.showDrag,getSize:function(b){return a._getSize(b)},parseTemplate:function(b,c,d,e,f,g,h){var i=" file-preview-initial";return a._generatePreviewTemplate(b,c,d,e,f,!1,null,i,g,h)},msg:function(b){return a._getMsgSelected(b)},initId:a.previewInitId,footer:a._getLayoutTemplate("footer").replace(/\{progress}/g,a._renderThumbProgress()),isDelete:a.initialPreviewShowDelete,caption:a.initialCaption,actions:function(b,c,d,e,f,g,h){return a._renderFileActions(b,c,d,e,f,g,h,!0)}}},fetch:function(a){return k.data[a].content.filter(function(a){return null!==a})},count:function(a,b){return k.data[a]&&k.data[a].content?b?k.data[a].content.length:k.fetch(a).length:0},get:function(b,c,d){var j,l,n,o,p,q,e="init_"+c,f=k.data[b],g=f.config[c],h=f.content[c],i=f.initId+"-"+e,m=" file-preview-initial",r=fa("previewAsData",g,f.previewAsData);return d=void 0===d||d,h?(g&&g.frameClass&&(m+=" "+g.frameClass),r?(n=f.previewAsData?fa("type",g,f.previewFileType||"generic"):"generic",o=fa("caption",g),p=k.footer(b,c,d,g&&g.size||null),q=fa("filetype",g,n),j=f.parseTemplate(n,h,o,q,i,p,e,null)):j=f.template.replace(/\{previewId}/g,i).replace(/\{frameClass}/g,m).replace(/\{fileindex}/g,e).replace(/\{content}/g,f.content[c]).replace(/\{template}/g,fa("type",g,f.previewFileType)).replace(/\{footer}/g,k.footer(b,c,d,g&&g.size||null)),f.tags.length&&f.tags[c]&&(j=ia(j,f.tags[c])),da(g)||da(g.frameAttr)||(l=a(document.createElement("div")).html(j),l.find(".file-preview-initial").attr(g.frameAttr),j=l.html(),l.remove()),j):""},add:function(b,c,d,e,f){var h,g=a.extend(!0,{},k.data[b]);return ea(c)||(c=c.split(g.delimiter)),f?(h=g.content.push(c)-1,g.config[h]=d,g.tags[h]=e):(h=c.length-1,g.content=c,g.config=d,g.tags=e),k.data[b]=g,h},set:function(b,c,d,e,f){var h,i,g=a.extend(!0,{},k.data[b]);if(c&&c.length&&(ea(c)||(c=c.split(g.delimiter)),i=c.filter(function(a){return null!==a}),i.length)){if(void 0===g.content&&(g.content=[]),void 0===g.config&&(g.config=[]),void 0===g.tags&&(g.tags=[]),f){for(h=0;h<c.length;h++)c[h]&&g.content.push(c[h]);for(h=0;h<d.length;h++)d[h]&&g.config.push(d[h]);for(h=0;h<e.length;h++)e[h]&&g.tags.push(e[h])}else g.content=c,g.config=d,g.tags=e;k.data[b]=g}},unset:function(a,b){var c=k.count(a.id);if(c){if(1===c)return k.data[a.id].content=[],k.data[a.id].config=[],k.data[a.id].tags=[],a.initialPreview=[],a.initialPreviewConfig=[],void(a.initialPreviewThumbTags=[]);k.data[a.id].content[b]=null,k.data[a.id].config[b]=null,k.data[a.id].tags[b]=null}},out:function(a){var d,b="",c=k.data[a],e=k.count(a,!0);if(0===e)return{content:"",caption:""};for(var f=0;f<e;f++)b+=k.get(a,f);return d=c.msg(k.count(a)),{content:'<div class="file-initial-thumbs">'+b+"</div>",caption:d}},footer:function(a,b,c,d){var e=k.data[a];if(c=void 0===c||c,0===e.config.length||da(e.config[b]))return"";var f=e.config[b],g=fa("caption",f),h=fa("width",f,"auto"),i=fa("url",f,!1),j=fa("key",f,null),l=fa("showDelete",f,!0),m=fa("showZoom",f,e.showZoom),n=fa("showDrag",f,e.showDrag),o=i===!1&&c,p=e.isDelete?e.actions(!1,l,m,n,o,i,j):"",q=e.footer.replace(/\{actions}/g,p);return q.replace(/\{caption}/g,g).replace(/\{size}/g,e.getSize(d)).replace(/\{width}/g,h).replace(/\{indicator}/g,"").replace(/\{indicatorTitle}/g,"")}},l=function(a,b){return b=b||0,"number"==typeof a?a:("string"==typeof a&&(a=parseFloat(a)),isNaN(a)?b:a)},m=function(){return!(!window.File||!window.FileReader)},n=function(){var a=document.createElement("div");return!i(9)&&(void 0!==a.draggable||void 0!==a.ondragstart&&void 0!==a.ondrop)},o=function(){return m()&&window.FormData},p=function(a,b){a.removeClass(b).addClass(b)},X={showRemove:!0,showUpload:!0,showZoom:!0,showDrag:!0,removeIcon:'<i class="glyphicon glyphicon-trash text-danger"></i>',removeClass:"btn btn-xs btn-default",removeTitle:"Remove file",uploadIcon:'<i class="glyphicon glyphicon-upload text-info"></i>',uploadClass:"btn btn-xs btn-default",uploadTitle:"Upload file",zoomIcon:'<i class="glyphicon glyphicon-zoom-in"></i>',zoomClass:"btn btn-xs btn-default",zoomTitle:"View Details",dragIcon:'<i class="glyphicon glyphicon-menu-hamburger"></i>',dragClass:"text-info",dragTitle:"Move / Rearrange",dragSettings:{},indicatorNew:'<i class="glyphicon glyphicon-hand-down text-warning"></i>',indicatorSuccess:'<i class="glyphicon glyphicon-ok-sign text-success"></i>',indicatorError:'<i class="glyphicon glyphicon-exclamation-sign text-danger"></i>',indicatorLoading:'<i class="glyphicon glyphicon-hand-up text-muted"></i>',indicatorNewTitle:"Not uploaded yet",indicatorSuccessTitle:"Uploaded",indicatorErrorTitle:"Upload Error",indicatorLoadingTitle:"Uploading ..."},q='{preview}\n<div class="kv-upload-progress hide"></div>\n<div class="input-group {class}">\n   {caption}\n   <div class="input-group-btn">\n       {remove}\n       {cancel}\n       {upload}\n       {browse}\n   </div>\n</div>',r='{preview}\n<div class="kv-upload-progress hide"></div>\n{remove}\n{cancel}\n{upload}\n{browse}\n',s='<div class="file-preview {class}">\n    {close}    <div class="{dropClass}">\n    <div class="file-preview-thumbnails">\n    </div>\n    <div class="clearfix"></div>    <div class="file-preview-status text-center text-success"></div>\n    <div class="kv-fileinput-error"></div>\n    </div>\n</div>',u='<div class="close fileinput-remove">&times;</div>\n',t='<i class="glyphicon glyphicon-file kv-caption-icon"></i>',v='<div tabindex="500" class="form-control file-caption {class}">\n   <div class="file-caption-name"></div>\n</div>\n',w='<button type="{type}" tabindex="500" title="{title}" class="{css}" {status}>{icon} {label}</button>',x='<a href="{href}" tabindex="500" title="{title}" class="{css}" {status}>{icon} {label}</a>',y='<div tabindex="500" class="{css}" {status}>{icon} {label}</div>',z='<div id="'+c+'" class="file-zoom-dialog modal fade" tabindex="-1" aria-labelledby="'+c+'Label"></div>',A='<div class="modal-dialog modal-lg" role="document">\n  <div class="modal-content">\n    <div class="modal-header">\n      <div class="kv-zoom-actions pull-right">{toggleheader}{fullscreen}{borderless}{close}</div>\n      <h3 class="modal-title">{heading} <small><span class="kv-zoom-title"></span></small></h3>\n    </div>\n    <div class="modal-body">\n      <div class="floating-buttons"></div>\n      <div class="kv-zoom-body file-zoom-content"></div>\n{prev} {next}\n    </div>\n  </div>\n</div>\n',B='<div class="progress">\n    <div class="{class}" role="progressbar" aria-valuenow="{percent}" aria-valuemin="0" aria-valuemax="100" style="width:{percent}%;">\n        {percent}%\n     </div>\n</div>',C=" <br><samp>({sizeText})</samp>",D='<div class="file-thumbnail-footer">\n    <div class="file-footer-caption" title="{caption}">{caption}{size}</div>\n    {progress} {actions}\n</div>',E='<div class="file-actions">\n    <div class="file-footer-buttons">\n        {upload} {delete} {zoom} {other}    </div>\n    {drag}\n    <div class="file-upload-indicator" title="{indicatorTitle}">{indicator}</div>\n    <div class="clearfix"></div>\n</div>',F='<button type="button" class="kv-file-remove {removeClass}" title="{removeTitle}" {dataUrl}{dataKey}>{removeIcon}</button>\n',G='<button type="button" class="kv-file-upload {uploadClass}" title="{uploadTitle}">{uploadIcon}</button>',H='<button type="button" class="kv-file-zoom {zoomClass}" title="{zoomTitle}">{zoomIcon}</button>',I='<span class="file-drag-handle {dragClass}" title="{dragTitle}">{dragIcon}</span>',J='<div class="file-preview-frame{frameClass}" id="{previewId}" data-fileindex="{fileindex}" data-template="{template}"',K=J+'><div class="kv-file-content">\n',L=J+' title="{caption}" '+d+'><div class="kv-file-content">\n',M="</div>{footer}\n</div>\n",N="{content}\n",O='<div class="kv-preview-data file-preview-html" title="{caption}" '+d+">{data}</div>\n",P='<img src="{data}" class="kv-preview-data file-preview-image" title="{caption}" alt="{caption}" '+d+">\n",Q='<textarea class="kv-preview-data file-preview-text" title="{caption}" readonly '+d+">{data}</textarea>\n",R='<video class="kv-preview-data" width="{width}" height="{height}" controls>\n<source src="{data}" type="{type}">\n'+f+"\n</video>\n",S='<audio class="kv-preview-data" controls>\n<source src="{data}" type="{type}">\n'+f+"\n</audio>\n",T='<object class="kv-preview-data file-object" type="application/x-shockwave-flash" width="{width}" height="{height}" data="{data}">\n'+e+" "+f+"\n</object>\n",U='<object class="kv-preview-data file-object" data="{data}" type="{type}" width="{width}" height="{height}">\n<param name="movie" value="{caption}" />\n'+e+" "+f+"\n</object>\n",V='<embed class="kv-preview-data" src="{data}" width="{width}" height="{height}" type="application/pdf">\n',W='<div class="kv-preview-data file-preview-other-frame">\n'+f+"\n</div>\n",Y={main1:q,main2:r,preview:s,close:u,fileIcon:t,caption:v,modalMain:z,modal:A,progress:B,size:C,footer:D,actions:E,actionDelete:F,actionUpload:G,actionZoom:H,actionDrag:I,btnDefault:w,btnLink:x,btnBrowse:y},Z={generic:K+N+M,html:K+O+M,image:K+P+M,text:K+Q+M,video:L+R+M,audio:L+S+M,flash:L+T+M,object:L+U+M,pdf:L+V+M,other:L+W+M},_=["image","html","text","video","audio","flash","pdf","object"],ba={image:{width:"auto",height:"160px"},html:{width:"213px",height:"160px"},text:{width:"213px",height:"160px"},video:{width:"213px",height:"160px"},audio:{width:"213px",height:"80px"},flash:{width:"213px",height:"160px"},object:{width:"160px",height:"160px"},pdf:{width:"160px",height:"160px"},other:{width:"160px",height:"160px"}},$={image:{width:"auto",height:"auto","max-width":"100%","max-height":"100%"},html:{width:"100%",height:"100%","min-height":"480px"},text:{width:"100%",height:"100%","min-height":"480px"},video:{width:"auto",height:"100%","max-width":"100%"},audio:{width:"100%",height:"30px"},flash:{width:"auto",height:"480px"},object:{width:"auto",height:"100%","min-height":"480px"},pdf:{width:"100%",height:"100%","min-height":"480px"},other:{width:"auto",height:"100%","min-height":"480px"}},ca={image:function(a,b){return h(a,"image.*")||h(b,/\.(gif|png|jpe?g)$/i)},html:function(a,b){return h(a,"text/html")||h(b,/\.(htm|html)$/i)},text:function(a,b){return h(a,"text.*")||h(b,/\.(xml|javascript)$/i)||h(b,/\.(txt|md|csv|nfo|ini|json|php|js|css)$/i)},video:function(a,b){return h(a,"video.*")&&(h(a,/(ogg|mp4|mp?g|webm|3gp)$/i)||h(b,/\.(og?|mp4|webm|mp?g|3gp)$/i))},audio:function(a,b){return h(a,"audio.*")&&(h(b,/(ogg|mp3|mp?g|wav)$/i)||h(b,/\.(og?|mp3|mp?g|wav)$/i))},flash:function(a,b){return h(a,"application/x-shockwave-flash",!0)||h(b,/\.(swf)$/i)},pdf:function(a,b){return h(a,"application/pdf",!0)||h(b,/\.(pdf)$/i)},object:function(){return!0},other:function(){return!0}},da=function(b,c){return void 0===b||null===b||0===b.length||c&&""===a.trim(b)},ea=function(a){return Array.isArray(a)||"[object Array]"===Object.prototype.toString.call(a)},fa=function(a,b,c){return c=c||"",b&&"object"==typeof b&&a in b?b[a]:c},aa=function(b,c,d){return da(b)||da(b[c])?d:a(b[c])},ga=function(){return Math.round((new Date).getTime()+100*Math.random())},ha=function(a){return a.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&apos;")},ia=function(b,c){var d=b;return c?(a.each(c,function(a,b){"function"==typeof b&&(b=b()),d=d.split(a).join(b)}),d):d},ja=function(a){var b=a.is("img")?a.attr("src"):a.find("source").attr("src");g.revokeObjectURL(b)},ka=function(a){var b=a.lastIndexOf("/");return b===-1&&(b=a.lastIndexOf("\\")),a.split(a.substring(b,b+1)).pop()},la=function(){return document.fullscreenElement||document.mozFullScreenElement||document.webkitFullscreenElement||document.msFullscreenElement},ma=function(a){a&&!la()?document.documentElement.requestFullscreen?document.documentElement.requestFullscreen():document.documentElement.msRequestFullscreen?document.documentElement.msRequestFullscreen():document.documentElement.mozRequestFullScreen?document.documentElement.mozRequestFullScreen():document.documentElement.webkitRequestFullscreen&&document.documentElement.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT):document.exitFullscreen?document.exitFullscreen():document.msExitFullscreen?document.msExitFullscreen():document.mozCancelFullScreen?document.mozCancelFullScreen():document.webkitExitFullscreen&&document.webkitExitFullscreen()},na=function(a,b,c){if(c>=a.length)for(var d=c-a.length;d--+1;)a.push(void 0);return a.splice(c,0,a.splice(b,1)[0]),a},oa=function(b,c){var d=this;d.$element=a(b),d._validate()&&(d.isPreviewable=m(),d.isIE9=i(9),d.isIE10=i(10),d.isPreviewable||d.isIE9?(d._init(c),d._listen()):d.$element.removeClass("file-loading"))},oa.prototype={constructor:oa,_init:function(b){var e,c=this,d=c.$element;a.each(b,function(a,b){switch(a){case"minFileCount":case"maxFileCount":case"maxFileSize":c[a]=l(b);break;default:c[a]=b}}),c.fileInputCleared=!1,c.fileBatchCompleted=!0,c.isPreviewable||(c.showPreview=!1),c.uploadFileAttr=da(d.attr("name"))?"file_data":d.attr("name"),c.reader=null,c.formdata={},c.clearStack(),c.uploadCount=0,c.uploadStatus={},c.uploadLog=[],c.uploadAsyncCount=0,c.loadedImages=[],c.totalImagesCount=0,c.ajaxRequests=[],c.isError=!1,c.ajaxAborted=!1,c.cancelling=!1,e=c._getLayoutTemplate("progress"),c.progressTemplate=e.replace("{class}",c.progressClass),c.progressCompleteTemplate=e.replace("{class}",c.progressCompleteClass),c.progressErrorTemplate=e.replace("{class}",c.progressErrorClass),c.dropZoneEnabled=n()&&c.dropZoneEnabled,c.isDisabled=c.$element.attr("disabled")||c.$element.attr("readonly"),c.isUploadable=o()&&!da(c.uploadUrl),c.isClickable=c.browseOnZoneClick&&c.showPreview&&(c.isUploadable&&c.dropZoneEnabled||!da(c.defaultPreviewContent)),c.slug="function"==typeof b.slugCallback?b.slugCallback:c._slugDefault,c.mainTemplate=c.showCaption?c._getLayoutTemplate("main1"):c._getLayoutTemplate("main2"),c.captionTemplate=c._getLayoutTemplate("caption"),c.previewGenericTemplate=c._getPreviewTemplate("generic"),c.resizeImage&&(c.maxImageWidth||c.maxImageHeight)&&(c.imageCanvas=document.createElement("canvas"),c.imageCanvasContext=c.imageCanvas.getContext("2d")),da(c.$element.attr("id"))&&c.$element.attr("id",ga()),void 0===c.$container?c.$container=c._createContainer():c._refreshContainer(),c.$dropZone=c.$container.find(".file-drop-zone"),c.$progress=c.$container.find(".kv-upload-progress"),c.$btnUpload=c.$container.find(".fileinput-upload"),c.$captionContainer=aa(b,"elCaptionContainer",c.$container.find(".file-caption")),c.$caption=aa(b,"elCaptionText",c.$container.find(".file-caption-name")),c.$previewContainer=aa(b,"elPreviewContainer",c.$container.find(".file-preview")),c.$preview=aa(b,"elPreviewImage",c.$container.find(".file-preview-thumbnails")),c.$previewStatus=aa(b,"elPreviewStatus",c.$container.find(".file-preview-status")),c.$errorContainer=aa(b,"elErrorContainer",c.$previewContainer.find(".kv-fileinput-error")),da(c.msgErrorClass)||p(c.$errorContainer,c.msgErrorClass),c.$errorContainer.hide(),c.fileActionSettings=a.extend(!0,X,b.fileActionSettings),c.previewInitId="preview-"+ga(),c.id=c.$element.attr("id"),k.init(c),c._initPreview(!0),c._initPreviewActions(),c.options=b,c._setFileDropZoneTitle(),c.$element.removeClass("file-loading"),c.$element.attr("disabled")&&c.disable(),c._initZoom()},_validate:function(){var b,a=this;return"file"===a.$element.attr("type")||(b='<div class="help-block alert alert-warning"><h4>Invalid Input Type</h4>You must set an input <code>type = file</code> for <b>bootstrap-fileinput</b> plugin to initialize.</div>',a.$element.after(b),!1)},_errorsExist:function(){var c,b=this;return!!b.$errorContainer.find("li").length||(c=a(document.createElement("div")).html(b.$errorContainer.html()),c.find("span.kv-error-close").remove(),c.find("ul").remove(),!!a.trim(c.text()).length)},_errorHandler:function(a,b){var c=this,d=a.target.error;d.code===d.NOT_FOUND_ERR?c._showError(c.msgFileNotFound.replace("{name}",b)):d.code===d.SECURITY_ERR?c._showError(c.msgFileSecured.replace("{name}",b)):d.code===d.NOT_READABLE_ERR?c._showError(c.msgFileNotReadable.replace("{name}",b)):d.code===d.ABORT_ERR?c._showError(c.msgFilePreviewAborted.replace("{name}",b)):c._showError(c.msgFilePreviewError.replace("{name}",b))},_addError:function(a){var b=this,c=b.$errorContainer;a&&c.length&&(c.html(b.errorCloseButton+a),j(c.find(".kv-error-close"),"click",function(){c.fadeOut("slow")}))},_resetErrors:function(a){var b=this,c=b.$errorContainer;b.isError=!1,b.$container.removeClass("has-error"),c.html(""),a?c.fadeOut("slow"):c.hide()},_showFolderError:function(a){var d,b=this,c=b.$errorContainer;a&&(d=b.msgFoldersNotAllowed.replace(/\{n}/g,a),b._addError(d),p(b.$container,"has-error"),c.fadeIn(800),b._raise("filefoldererror",[a,d]))},_showUploadError:function(a,b,c){var d=this,e=d.$errorContainer,f=c||"fileuploaderror",g=b&&b.id?'<li data-file-id="'+b.id+'">'+a+"</li>":"<li>"+a+"</li>";return 0===e.find("ul").length?d._addError("<ul>"+g+"</ul>"):e.find("ul").append(g),e.fadeIn(800),d._raise(f,[b,a]),d.$container.removeClass("file-input-new"),p(d.$container,"has-error"),!0},_showError:function(a,b,c){var d=this,e=d.$errorContainer,f=c||"fileerror";return b=b||{},b.reader=d.reader,d._addError(a),e.fadeIn(800),d._raise(f,[b,a]),d.isUploadable||d._clearFileInput(),d.$container.removeClass("file-input-new"),p(d.$container,"has-error"),d.$btnUpload.attr("disabled",!0),!0},_noFilesError:function(a){var b=this,c=b.minFileCount>1?b.filePlural:b.fileSingle,d=b.msgFilesTooLess.replace("{n}",b.minFileCount).replace("{files}",c),e=b.$errorContainer;b._addError(d),b.isError=!0,b._updateFileDetails(0),e.fadeIn(800),b._raise("fileerror",[a,d]),b._clearFileInput(),p(b.$container,"has-error")},_parseError:function(b,c,d){var e=this,f=a.trim(c+""),g="."===f.slice(-1)?"":".",h=void 0!==b.responseJSON&&void 0!==b.responseJSON.error?b.responseJSON.error:b.responseText;return e.cancelling&&e.msgUploadAborted&&(f=e.msgUploadAborted),e.showAjaxErrorDetails&&h?(h=a.trim(h.replace(/\n\s*\n/g,"\n")),h=h.length>0?"<pre>"+h+"</pre>":"",f+=g+h):f+=g,e.cancelling=!1,d?"<b>"+d+": </b>"+f:f},_parseFileType:function(a){var c,d,e,f,b=this;for(f=0;f<_.length;f+=1)if(e=_[f],c=fa(e,b.fileTypeSettings,ca[e]),d=c(a.type,a.name)?e:"",!da(d))return d;return"other"},_parseFilePreviewIcon:function(b,c){var e,f,d=this,g=d.previewFileIcon;return c&&c.indexOf(".")>-1&&(f=c.split(".").pop(),d.previewFileIconSettings&&d.previewFileIconSettings[f]&&(g=d.previewFileIconSettings[f]),d.previewFileExtSettings&&a.each(d.previewFileExtSettings,function(a,b){return d.previewFileIconSettings[a]&&b(f)?void(g=d.previewFileIconSettings[a]):void(e=!0)})),b.indexOf("{previewFileIcon}")>-1?b.replace(/\{previewFileIconClass}/g,d.previewFileIconClass).replace(/\{previewFileIcon}/g,g):b},_raise:function(b,c){var d=this,e=a.Event(b);if(void 0!==c?d.$element.trigger(e,c):d.$element.trigger(e),e.isDefaultPrevented())return!1;if(!e.result)return e.result;switch(b){case"filebatchuploadcomplete":case"filebatchuploadsuccess":case"fileuploaded":case"fileclear":case"filecleared":case"filereset":case"fileerror":case"filefoldererror":case"fileuploaderror":case"filebatchuploaderror":case"filedeleteerror":case"filecustomerror":case"filesuccessremove":break;default:d.ajaxAborted=e.result}return!0},_listenFullScreen:function(a){var d,e,b=this,c=b.$modal;c&&c.length&&(d=c&&c.find(".btn-fullscreen"),e=c&&c.find(".btn-borderless"),d.length&&e.length&&(d.removeClass("active").attr("aria-pressed","false"),e.removeClass("active").attr("aria-pressed","false"),a?d.addClass("active").attr("aria-pressed","true"):e.addClass("active").attr("aria-pressed","true"),c.hasClass("file-zoom-fullscreen")?b._maximizeZoomDialog():a?b._maximizeZoomDialog():e.removeClass("active").attr("aria-pressed","false")))},_listen:function(){var b=this,c=b.$element,d=c.closest("form"),e=b.$container;j(c,"change",a.proxy(b._change,b)),b.showBrowse&&j(b.$btnFile,"click",a.proxy(b._browse,b)),j(d,"reset",a.proxy(b.reset,b)),j(e.find(".fileinput-remove:not([disabled])"),"click",a.proxy(b.clear,b)),j(e.find(".fileinput-cancel"),"click",a.proxy(b.cancel,b)),b._initDragDrop(),b.isUploadable||j(d,"submit",a.proxy(b._submitForm,b)),j(b.$container.find(".fileinput-upload"),"click",a.proxy(b._uploadClick,b)),j(a(window),"resize",function(){b._listenFullScreen(screen.width===window.innerWidth&&screen.height===window.innerHeight)}),j(a(document),"webkitfullscreenchange mozfullscreenchange fullscreenchange MSFullscreenChange",function(){b._listenFullScreen(la())}),b._initClickable()},_initClickable:function(){var c,b=this;b.isClickable&&(c=b.isUploadable?b.$dropZone:b.$preview.find(".file-default-preview"),p(c,"clickable"),c.attr("tabindex",-1),j(c,"click",function(d){var e=a(d.target);e.parents(".file-preview-thumbnails").length&&!e.parents(".file-default-preview").length||(b.$element.trigger("click"),c.blur())}))},_initDragDrop:function(){var b=this,c=b.$dropZone;b.isUploadable&&b.dropZoneEnabled&&b.showPreview&&(j(c,"dragenter dragover",a.proxy(b._zoneDragEnter,b)),j(c,"dragleave",a.proxy(b._zoneDragLeave,b)),j(c,"drop",a.proxy(b._zoneDrop,b)),j(a(document),"dragenter dragover drop",b._zoneDragDropInit))},_zoneDragDropInit:function(a){a.stopPropagation(),a.preventDefault()},_zoneDragEnter:function(b){var c=this,d=a.inArray("Files",b.originalEvent.dataTransfer.types)>-1;return c._zoneDragDropInit(b),c.isDisabled||!d?(b.originalEvent.dataTransfer.effectAllowed="none",void(b.originalEvent.dataTransfer.dropEffect="none")):void p(c.$dropZone,"file-highlighted")},_zoneDragLeave:function(a){var b=this;b._zoneDragDropInit(a),b.isDisabled||b.$dropZone.removeClass("file-highlighted")},_zoneDrop:function(a){var b=this;a.preventDefault(),b.isDisabled||da(a.originalEvent.dataTransfer.files)||(b._change(a,"dragdrop"),b.$dropZone.removeClass("file-highlighted"))},_uploadClick:function(a){var d,b=this,c=b.$container.find(".fileinput-upload"),e=!c.hasClass("disabled")&&da(c.attr("disabled"));if(!a||!a.isDefaultPrevented()){if(!b.isUploadable)return void(e&&"submit"!==c.attr("type")&&(d=c.closest("form"),d.length&&d.trigger("submit"),a.preventDefault()));a.preventDefault(),e&&b.upload()}},_submitForm:function(){var a=this,b=a.$element,c=b.get(0).files;return c&&a.minFileCount>0&&a._getFileCount(c.length)<a.minFileCount?(a._noFilesError({}),!1):!a._abort({})},_clearPreview:function(){var a=this,b=a.showUploadedThumbs?a.$preview.find(".file-preview-frame:not(.file-preview-success)"):a.$preview.find(".file-preview-frame");b.remove(),a.$preview.find(".file-preview-frame").length&&a.showPreview||a._resetUpload(),a._validateDefaultPreview()},_initSortable:function(){var d,e,b=this,c=b.$preview;window.KvSortable&&(d=c.find(".file-initial-thumbs"),e={handle:".drag-handle-init",dataIdAttr:"data-preview-id",draggable:".file-preview-initial",onSort:function(c){var d=c.oldIndex,e=c.newIndex;b.initialPreview=na(b.initialPreview,d,e),b.initialPreviewConfig=na(b.initialPreviewConfig,d,e),k.init(b);for(var f=0;f<b.initialPreviewConfig.length;f++)if(null!==b.initialPreviewConfig[f]){var g=b.initialPreviewConfig[f].key,h=a(".kv-file-remove[data-key='"+g+"']");h=h.closest(".file-preview-frame"),h.attr("data-fileindex","init_"+f),h.data("fileindex","init_"+f)}b._raise("filesorted",{previewId:a(c.item).attr("id"),oldIndex:d,newIndex:e,stack:b.initialPreviewConfig})}},d.data("kvsortable")&&d.kvsortable("destroy"),a.extend(!0,e,b.fileActionSettings.dragSettings),d.kvsortable(e))},_initPreview:function(a){var d,b=this,c=b.initialCaption||"";return k.count(b.id)?(d=k.out(b.id),c=a&&b.initialCaption?b.initialCaption:d.caption,b.$preview.html(d.content),b._setCaption(c),b._initSortable(),void(da(d.content)||b.$container.removeClass("file-input-new"))):(b._clearPreview(),void(a?b._setCaption(c):b._initCaption()))},_getZoomButton:function(a){var b=this,c=b.previewZoomButtonIcons[a],d=b.previewZoomButtonClasses[a],e=' title="'+(b.previewZoomButtonTitles[a]||"")+'" ',f=e+("close"===a?' data-dismiss="modal" aria-hidden="true"':"");return"fullscreen"!==a&&"borderless"!==a&&"toggleheader"!==a||(f+=' data-toggle="button" aria-pressed="false" autocomplete="off"'),'<button type="button" class="'+d+" btn-"+a+'"'+f+">"+c+"</button>"},_getModalContent:function(){var a=this;return a._getLayoutTemplate("modal").replace(/\{heading}/g,a.msgZoomModalHeading).replace(/\{prev}/g,a._getZoomButton("prev")).replace(/\{next}/g,a._getZoomButton("next")).replace(/\{toggleheader}/g,a._getZoomButton("toggleheader")).replace(/\{fullscreen}/g,a._getZoomButton("fullscreen")).replace(/\{borderless}/g,a._getZoomButton("borderless")).replace(/\{close}/g,a._getZoomButton("close"))},_listenModalEvent:function(a){var b=this,c=b.$modal,d=function(a){return{sourceEvent:a,previewId:c.data("previewId"),modal:c}};c.on(a+".bs.modal",function(e){var f=c.find(".btn-fullscreen"),g=c.find(".btn-borderless");b._raise("filezoom"+a,d(e)),"shown"===a&&(g.removeClass("active").attr("aria-pressed","false"),f.removeClass("active").attr("aria-pressed","false"),c.hasClass("file-zoom-fullscreen")&&(b._maximizeZoomDialog(),la()?f.addClass("active").attr("aria-pressed","true"):g.addClass("active").attr("aria-pressed","true")))})},_initZoom:function(){var d,b=this,e=b._getLayoutTemplate("modalMain"),f="#"+c;b.$modal=a(f),b.$modal&&b.$modal.length||(d=a(document.createElement("div")).html(e).insertAfter(b.$container),b.$modal=a("#"+c).insertBefore(d),d.remove()),b.$modal.html(b._getModalContent()),b._listenModalEvent("show"),b._listenModalEvent("shown"),b._listenModalEvent("hide"),b._listenModalEvent("hidden"),b._listenModalEvent("loaded")},_initZoomButtons:function(){var d,e,b=this,c=b.$modal.data("previewId")||"",f=b.$preview.find(".file-preview-frame").toArray(),g=f.length,h=b.$modal.find(".btn-prev"),i=b.$modal.find(".btn-next");g&&(d=a(f[0]),e=a(f[g-1]),h.removeAttr("disabled"),i.removeAttr("disabled"),d.length&&d.attr("id")===c&&h.attr("disabled",!0),e.length&&e.attr("id")===c&&i.attr("disabled",!0))},_maximizeZoomDialog:function(){var b=this,c=b.$modal,d=c.find(".modal-header:visible"),e=c.find(".modal-footer:visible"),f=c.find(".modal-body"),g=a(window).height(),h=0;c.addClass("file-zoom-fullscreen"),d&&d.length&&(g-=d.outerHeight(!0)),e&&e.length&&(g-=e.outerHeight(!0)),f&&f.length&&(h=f.outerHeight(!0)-f.height(),g-=h),c.find(".kv-zoom-body").height(g)},_resizeZoomDialog:function(a){var b=this,c=b.$modal,d=c.find(".btn-fullscreen"),e=c.find(".btn-borderless");if(c.hasClass("file-zoom-fullscreen"))ma(!1),a?d.hasClass("active")||(c.removeClass("file-zoom-fullscreen"),b._resizeZoomDialog(!0),e.hasClass("active")&&e.removeClass("active").attr("aria-pressed","false")):d.hasClass("active")?d.removeClass("active").attr("aria-pressed","false"):(c.removeClass("file-zoom-fullscreen"),b.$modal.find(".kv-zoom-body").css("height",b.zoomModalHeight));else{if(!a)return void b._maximizeZoomDialog();ma(!0)}c.focus()},_setZoomContent:function(b,c){var e,f,g,h,i,k,l,r,d=this,m=b.attr("id"),n=d.$modal,o=n.find(".btn-prev"),q=n.find(".btn-next"),s=n.find(".btn-fullscreen"),t=n.find(".btn-borderless"),u=n.find(".btn-toggleheader");f=b.data("template")||"generic",e=b.find(".kv-file-content"),g=e.length?e.html():"",h=b.find(".file-footer-caption").text()||"",n.find(".kv-zoom-title").html(h),i=n.find(".kv-zoom-body"),c?(r=i.clone().insertAfter(i),i.html(g).hide(),r.fadeOut("fast",function(){i.fadeIn("fast"),r.remove()})):i.html(g),l=d.previewZoomSettings[f],l&&(k=i.find(".kv-preview-data"),p(k,"file-zoom-detail"),a.each(l,function(a,b){k.css(a,b),(k.attr("width")&&"width"===a||k.attr("height")&&"height"===a)&&k.removeAttr(a)})),n.data("previewId",m),j(o,"click",function(){d._zoomSlideShow("prev",m)}),j(q,"click",function(){d._zoomSlideShow("next",m)}),j(s,"click",function(){d._resizeZoomDialog(!0)}),j(t,"click",function(){d._resizeZoomDialog(!1)}),j(u,"click",function(){var c,a=n.find(".modal-header"),b=n.find(".modal-body .floating-buttons"),e=a.find(".kv-zoom-actions"),f=function(b){var c=d.$modal.find(".kv-zoom-body"),e=d.zoomModalHeight;n.hasClass("file-zoom-fullscreen")&&(e=c.outerHeight(!0),b||(e-=a.outerHeight(!0))),c.css("height",b?e+b:e)};a.is(":visible")?(c=a.outerHeight(!0),a.slideUp("slow",function(){e.find(".btn").appendTo(b),f(c)})):(b.find(".btn").appendTo(e),a.slideDown("slow",function(){f()})),n.focus()}),j(n,"keydown",function(a){var b=a.which||a.keyCode;37!==b||o.attr("disabled")||d._zoomSlideShow("prev",m),39!==b||q.attr("disabled")||d._zoomSlideShow("next",m)})},_zoomPreview:function(a){var c,b=this;if(!a.length)throw"Cannot zoom to detailed preview!";b.$modal.html(b._getModalContent()),c=a.closest(".file-preview-frame"),b._setZoomContent(c),b.$modal.modal("show"),b._initZoomButtons()},_zoomSlideShow:function(b,c){var f,g,j,d=this,e=d.$modal.find(".kv-zoom-actions .btn-"+b),h=d.$preview.find(".file-preview-frame").toArray(),i=h.length;if(!e.attr("disabled")){for(g=0;g<i;g++)if(a(h[g]).attr("id")===c){j="prev"===b?g-1:g+1;break}j<0||j>=i||!h[j]||(f=a(h[j]),f.length&&d._setZoomContent(f,!0),d._initZoomButtons(),d._raise("filezoom"+b,{previewId:c,modal:d.$modal}))}},_initZoomButton:function(){var b=this;b.$preview.find(".kv-file-zoom").each(function(){var c=a(this);j(c,"click",function(){b._zoomPreview(c)})})},_initPreviewActions:function(){var b=this,c=b.deleteExtraData||{},d=function(){var a=b.isUploadable?k.count(b.id):b.$element.get(0).files.length;0!==b.$preview.find(".kv-file-remove").length||a||(b.reset(),b.initialCaption="")};b._initZoomButton(),b.$preview.find(".kv-file-remove").each(function(){var e=a(this),f=e.data("url")||b.deleteUrl,g=e.data("key");if(!da(f)&&void 0!==g){var l,m,o,q,h=e.closest(".file-preview-frame"),i=k.data[b.id],n=h.data("fileindex");n=parseInt(n.replace("init_","")),o=da(i.config)&&da(i.config[n])?null:i.config[n],q=da(o)||da(o.extra)?c:o.extra,"function"==typeof q&&(q=q()),m={id:e.attr("id"),key:g,extra:q},l=a.extend(!0,{},{url:f,type:"POST",dataType:"json",data:a.extend(!0,{},{key:g},q),beforeSend:function(a){b.ajaxAborted=!1,b._raise("filepredelete",[g,a,q]),b.ajaxAborted?a.abort():(p(h,"file-uploading"),p(e,"disabled"))},success:function(a,c,f){var i,j;return da(a)||da(a.error)?(k.init(b),n=parseInt(h.data("fileindex").replace("init_","")),k.unset(b,n),i=k.count(b.id),
+    j=i>0?b._getMsgSelected(i):"",b._raise("filedeleted",[g,f,q]),b._setCaption(j),h.removeClass("file-uploading").addClass("file-deleted"),void h.fadeOut("slow",function(){b._clearObjects(h),h.remove(),d(),i||0!==b.getFileStack().length||(b._setCaption(""),b.reset())})):(m.jqXHR=f,m.response=a,b._showError(a.error,m,"filedeleteerror"),h.removeClass("file-uploading"),e.removeClass("disabled"),void d())},error:function(a,c,e){var f=b._parseError(a,e);m.jqXHR=a,m.response={},b._showError(f,m,"filedeleteerror"),h.removeClass("file-uploading"),d()}},b.ajaxDeleteSettings),j(e,"click",function(){return!!b._validateMinCount()&&void a.ajax(l)})}})},_clearObjects:function(b){b.find("video audio").each(function(){this.pause(),a(this).remove()}),b.find("img object div").each(function(){a(this).remove()})},_clearFileInput:function(){var d,e,f,b=this,c=b.$element;b.fileInputCleared=!0,da(c.val())||(b.isIE9||b.isIE10?(d=c.closest("form"),e=a(document.createElement("form")),f=a(document.createElement("div")),c.before(f),d.length?d.after(e):f.after(e),e.append(c).trigger("reset"),f.before(c).remove(),e.remove()):c.val(""))},_resetUpload:function(){var a=this;a.uploadCache={content:[],config:[],tags:[],append:!0},a.uploadCount=0,a.uploadStatus={},a.uploadLog=[],a.uploadAsyncCount=0,a.loadedImages=[],a.totalImagesCount=0,a.$btnUpload.removeAttr("disabled"),a._setProgress(0),p(a.$progress,"hide"),a._resetErrors(!1),a.ajaxAborted=!1,a.ajaxRequests=[],a._resetCanvas()},_resetCanvas:function(){var a=this;a.canvas&&a.imageCanvasContext&&a.imageCanvasContext.clearRect(0,0,a.canvas.width,a.canvas.height)},_hasInitialPreview:function(){var a=this;return!a.overwriteInitial&&k.count(a.id)},_resetPreview:function(){var b,c,a=this;k.count(a.id)?(b=k.out(a.id),a.$preview.html(b.content),c=a.initialCaption?a.initialCaption:b.caption,a._setCaption(c)):(a._clearPreview(),a._initCaption()),a.showPreview&&(a._initZoom(),a._initSortable())},_clearDefaultPreview:function(){var a=this;a.$preview.find(".file-default-preview").remove()},_validateDefaultPreview:function(){var a=this;a.showPreview&&!da(a.defaultPreviewContent)&&(a.$preview.html('<div class="file-default-preview">'+a.defaultPreviewContent+"</div>"),a.$container.removeClass("file-input-new"),a._initClickable())},_resetPreviewThumbs:function(a){var c,b=this;return a?(b._clearPreview(),void b.clearStack()):void(b._hasInitialPreview()?(c=k.out(b.id),b.$preview.html(c.content),b._setCaption(c.caption),b._initPreviewActions()):b._clearPreview())},_getLayoutTemplate:function(a){var b=this,c=fa(a,b.layoutTemplates,Y[a]);return da(b.customLayoutTags)?c:ia(c,b.customLayoutTags)},_getPreviewTemplate:function(a){var b=this,c=fa(a,b.previewTemplates,Z[a]);return da(b.customPreviewTags)?c:ia(c,b.customPreviewTags)},_getOutData:function(a,b,c){var d=this;return a=a||{},b=b||{},c=c||d.filestack.slice(0)||{},{form:d.formdata,files:c,filenames:d.filenames,filescount:d.getFilesCount(),extra:d._getExtraData(),response:b,reader:d.reader,jqXHR:a}},_getMsgSelected:function(a){var b=this,c=1===a?b.fileSingle:b.filePlural;return a>0?b.msgSelected.replace("{n}",a).replace("{files}",c):b.msgNoFilesSelected},_getThumbs:function(a){return a=a||"",this.$preview.find(".file-preview-frame:not(.file-preview-initial)"+a)},_getExtraData:function(a,b){var c=this,d=c.uploadExtraData;return"function"==typeof c.uploadExtraData&&(d=c.uploadExtraData(a,b)),d},_initXhr:function(a,b,c){var d=this;return a.upload&&a.upload.addEventListener("progress",function(a){var e=0,f=a.total,g=a.loaded||a.position;a.lengthComputable&&(e=Math.floor(g/f*100)),b?d._setAsyncUploadStatus(b,e,c):d._setProgress(e)},!1),a},_ajaxSubmit:function(b,c,d,e,f,g){var i,h=this;h._raise("filepreajax",[f,g]),h._uploadExtra(f,g),i=a.extend(!0,{},{xhr:function(){var b=a.ajaxSettings.xhr();return h._initXhr(b,f,h.getFileStack().length)},url:h.uploadUrl,type:"POST",dataType:"json",data:h.formdata,cache:!1,processData:!1,contentType:!1,beforeSend:b,success:c,complete:d,error:e},h.ajaxSettings),h.ajaxRequests.push(a.ajax(i))},_initUploadSuccess:function(b,c,d){var f,g,h,i,j,l,m,n,e=this,o=function(a,b){e[a]instanceof Array||(e[a]=[]),b&&b.length&&(e[a]=e[a].concat(b))};e.showPreview&&"object"==typeof b&&!a.isEmptyObject(b)&&void 0!==b.initialPreview&&b.initialPreview.length>0&&(e.hasInitData=!0,j=b.initialPreview||[],l=b.initialPreviewConfig||[],m=b.initialPreviewThumbTags||[],f=!(void 0!==b.append&&!b.append),j.length>0&&!ea(j)&&(j=j.split(e.initialPreviewDelimiter)),e.overwriteInitial=!1,o("initialPreview",j),o("initialPreviewConfig",l),o("initialPreviewThumbTags",m),void 0!==c?d?(n=c.attr("data-fileindex"),e.uploadCache.content[n]=j[0],e.uploadCache.config[n]=l[0]||[],e.uploadCache.tags[n]=m[0]||[],e.uploadCache.append=f):(h=k.add(e.id,j,l[0],m[0],f),g=k.get(e.id,h,!1),i=a(g).hide(),c.after(i).fadeOut("slow",function(){i.fadeIn("slow").css("display:inline-block"),e._initPreviewActions(),e._clearFileInput(),c.remove()})):(k.set(e.id,j,l,m,f),e._initPreview(),e._initPreviewActions()))},_initSuccessThumbs:function(){var b=this;b.showPreview&&b._getThumbs(".file-preview-success").each(function(){var c=a(this),d=c.find(".kv-file-remove");d.removeAttr("disabled"),j(d,"click",function(){var a=b._raise("filesuccessremove",[c.attr("id"),c.data("fileindex")]);ja(c),a!==!1&&c.fadeOut("slow",function(){c.remove(),b.$preview.find(".file-preview-frame").length||b.reset()})})})},_checkAsyncComplete:function(){var c,d,b=this;for(d=0;d<b.filestack.length;d++)if(b.filestack[d]&&(c=b.previewInitId+"-"+d,a.inArray(c,b.uploadLog)===-1))return!1;return b.uploadAsyncCount===b.uploadLog.length},_uploadExtra:function(b,c){var d=this,e=d._getExtraData(b,c);0!==e.length&&a.each(e,function(a,b){d.formdata.append(a,b)})},_uploadSingle:function(b,c,d){var h,j,l,m,n,q,r,s,t,u,e=this,f=e.getFileStack().length,g=new FormData,i=e.previewInitId+"-"+b,o=e.filestack.length>0||!a.isEmptyObject(e.uploadExtraData),v={id:i,index:b};e.formdata=g,e.showPreview&&(j=a("#"+i+":not(.file-preview-initial)"),m=j.find(".kv-file-upload"),n=j.find(".kv-file-remove"),a("#"+i).find(".file-thumb-progress").removeClass("hide")),0===f||!o||m&&m.hasClass("disabled")||e._abort(v)||(u=function(a,b){e.updateStack(a,void 0),e.uploadLog.push(b),e._checkAsyncComplete()&&(e.fileBatchCompleted=!0)},l=function(){var a=e.uploadCache;e.fileBatchCompleted&&setTimeout(function(){e.showPreview&&(k.set(e.id,a.content,a.config,a.tags,a.append),e.hasInitData&&(e._initPreview(),e._initPreviewActions())),e.unlock(),e._clearFileInput(),e._raise("filebatchuploadcomplete",[e.filestack,e._getExtraData()]),e.uploadCount=0,e.uploadStatus={},e.uploadLog=[],e._setProgress(101)},100)},q=function(c){h=e._getOutData(c),e.fileBatchCompleted=!1,e.showPreview&&(j.hasClass("file-preview-success")||(e._setThumbStatus(j,"Loading"),p(j,"file-uploading")),m.attr("disabled",!0),n.attr("disabled",!0)),d||e.lock(),e._raise("filepreupload",[h,i,b]),a.extend(!0,v,h),e._abort(v)&&(c.abort(),e._setProgressCancelled())},r=function(c,f,g){var k=e.showPreview&&j.attr("id")?j.attr("id"):i;h=e._getOutData(g,c),a.extend(!0,v,h),setTimeout(function(){da(c)||da(c.error)?(e.showPreview&&(e._setThumbStatus(j,"Success"),m.hide(),e._initUploadSuccess(c,j,d)),e._raise("fileuploaded",[h,k,b]),d?u(b,k):e.updateStack(b,void 0)):(e._showUploadError(c.error,v),e._setPreviewError(j,b),d&&u(b,k))},100)},s=function(){setTimeout(function(){e.showPreview&&(m.removeAttr("disabled"),n.removeAttr("disabled"),j.removeClass("file-uploading"),e._setProgress(101,a("#"+i).find(".file-thumb-progress"))),d?l():(e.unlock(!1),e._clearFileInput()),e._initSuccessThumbs()},100)},t=function(f,g,h){var k=e._parseError(f,h,d?c[b].name:null);setTimeout(function(){d&&u(b,i),e.uploadStatus[i]=100,e._setPreviewError(j,b),a.extend(!0,v,e._getOutData(f)),e._showUploadError(k,v)},100)},g.append(e.uploadFileAttr,c[b],e.filenames[b]),g.append("file_id",b),e._ajaxSubmit(q,r,s,t,i,b))},_uploadBatch:function(){var f,g,h,i,k,b=this,c=b.filestack,d=c.length,e={},j=b.filestack.length>0||!a.isEmptyObject(b.uploadExtraData);b.formdata=new FormData,0!==d&&j&&!b._abort(e)&&(k=function(){a.each(c,function(a){b.updateStack(a,void 0)}),b._clearFileInput()},f=function(c){b.lock();var d=b._getOutData(c);b.showPreview&&b._getThumbs().each(function(){var c=a(this),d=c.find(".kv-file-upload"),e=c.find(".kv-file-remove");c.hasClass("file-preview-success")||(b._setThumbStatus(c,"Loading"),p(c,"file-uploading")),d.attr("disabled",!0),e.attr("disabled",!0)}),b._raise("filebatchpreupload",[d]),b._abort(d)&&(c.abort(),b._setProgressCancelled())},g=function(c,d,e){var f=b._getOutData(e,c),g=b._getThumbs(":not(.file-preview-error)"),h=0,i=da(c)||da(c.errorkeys)?[]:c.errorkeys;da(c)||da(c.error)?(b._raise("filebatchuploadsuccess",[f]),k(),b.showPreview?(g.each(function(){var c=a(this),d=c.find(".kv-file-upload");c.find(".kv-file-upload").hide(),b._setThumbStatus(c,"Success"),c.removeClass("file-uploading"),d.removeAttr("disabled")}),b._initUploadSuccess(c)):b.reset()):(b.showPreview&&(g.each(function(){var c=a(this),d=c.find(".kv-file-remove"),e=c.find(".kv-file-upload");return c.removeClass("file-uploading"),e.removeAttr("disabled"),d.removeAttr("disabled"),0===i.length?void b._setPreviewError(c):(a.inArray(h,i)!==-1?b._setPreviewError(c):(c.find(".kv-file-upload").hide(),b._setThumbStatus(c,"Success"),b.updateStack(h,void 0)),void h++)}),b._initUploadSuccess(c)),b._showUploadError(c.error,f,"filebatchuploaderror"))},i=function(){b._setProgress(101),b.unlock(),b._initSuccessThumbs(),b._clearFileInput(),b._raise("filebatchuploadcomplete",[b.filestack,b._getExtraData()])},h=function(c,e,f){var g=b._getOutData(c),h=b._parseError(c,f);b._showUploadError(h,g,"filebatchuploaderror"),b.uploadFileCount=d-1,b.showPreview&&(b._getThumbs().each(function(){var c=a(this),d=c.attr("data-fileindex");c.removeClass("file-uploading"),void 0!==b.filestack[d]&&b._setPreviewError(c)}),b._getThumbs().removeClass("file-uploading"),b._getThumbs(" .kv-file-upload").removeAttr("disabled"),b._getThumbs(" .kv-file-delete").removeAttr("disabled"))},a.each(c,function(a,d){da(c[a])||b.formdata.append(b.uploadFileAttr,d,b.filenames[a])}),b._ajaxSubmit(f,g,i,h))},_uploadExtraOnly:function(){var c,d,e,f,a=this,b={};a.formdata=new FormData,a._abort(b)||(c=function(c){a.lock();var d=a._getOutData(c);a._raise("filebatchpreupload",[d]),a._setProgress(50),b.data=d,b.xhr=c,a._abort(b)&&(c.abort(),a._setProgressCancelled())},d=function(b,c,d){var e=a._getOutData(d,b);da(b)||da(b.error)?(a._raise("filebatchuploadsuccess",[e]),a._clearFileInput(),a._initUploadSuccess(b)):a._showUploadError(b.error,e,"filebatchuploaderror")},e=function(){a._setProgress(101),a.unlock(),a._clearFileInput(),a._raise("filebatchuploadcomplete",[a.filestack,a._getExtraData()])},f=function(c,d,e){var f=a._getOutData(c),g=a._parseError(c,e);b.data=f,a._showUploadError(g,f,"filebatchuploaderror")},a._ajaxSubmit(c,d,e,f))},_initFileActions:function(){var b=this;b.showPreview&&(b._initZoomButton(),b.$preview.find(".kv-file-remove").each(function(){var e,h,i,l,c=a(this),d=c.closest(".file-preview-frame"),f=d.attr("id"),g=d.attr("data-fileindex");j(c,"click",function(){return l=b._raise("filepreremove",[f,g]),!(l===!1||!b._validateMinCount())&&(e=d.hasClass("file-preview-error"),ja(d),void d.fadeOut("slow",function(){b.updateStack(g,void 0),b._clearObjects(d),d.remove(),f&&e&&b.$errorContainer.find('li[data-file-id="'+f+'"]').fadeOut("fast",function(){a(this).remove(),b._errorsExist()||b._resetErrors()}),b._clearFileInput();var c=b.getFileStack(!0),j=k.count(b.id),l=c.length,m=b.showPreview&&b.$preview.find(".file-preview-frame").length;0!==l||0!==j||m?(h=j+l,i=h>1?b._getMsgSelected(h):c[0]?b._getFileNames()[0]:"",b._setCaption(i)):b.reset(),b._raise("fileremoved",[f,g])}))})}),b.$preview.find(".kv-file-upload").each(function(){var c=a(this);j(c,"click",function(){var a=c.closest(".file-preview-frame"),d=a.attr("data-fileindex");a.hasClass("file-preview-error")||b._uploadSingle(d,b.filestack,!1)})}))},_hideFileIcon:function(){this.overwriteInitial&&this.$captionContainer.find(".kv-caption-icon").hide()},_showFileIcon:function(){this.$captionContainer.find(".kv-caption-icon").show()},_getSize:function(a){var b=this,c=parseFloat(a);if(!a||!c||isNaN(a)||isNaN(c))return b._getLayoutTemplate("size").replace("{sizeText}","0.00 KB");var d,f,g,e=b.fileSizeGetter;return"function"==typeof e?g=e(a):(d=Math.floor(Math.log(c)/Math.log(1024)),f=["B","KB","MB","GB","TB","PB","EB","ZB","YB"],g=1*(c/Math.pow(1024,d)).toFixed(2)+" "+f[d]),b._getLayoutTemplate("size").replace("{sizeText}",g)},_generatePreviewTemplate:function(a,b,c,d,e,f,g,h,i,j){var m,n,k=this,l=k._getPreviewTemplate(a),o=h||"",p=fa(a,k.previewSettings,ba[a]),q=k.slug(c),r=i||k._renderFileFooter(q,g,p.width,f);return j=j||e.slice(e.lastIndexOf("-")+1),l=k._parseFilePreviewIcon(l,c),"text"===a||"html"===a?(n="text"===a?ha(b):b,m=l.replace(/\{previewId}/g,e).replace(/\{caption}/g,q).replace(/\{width}/g,p.width).replace(/\{height}/g,p.height).replace(/\{frameClass}/g,o).replace(/\{cat}/g,d).replace(/\{footer}/g,r).replace(/\{fileindex}/g,j).replace(/\{data}/g,n).replace(/\{template}/g,a)):m=l.replace(/\{previewId}/g,e).replace(/\{caption}/g,q).replace(/\{frameClass}/g,o).replace(/\{type}/g,d).replace(/\{fileindex}/g,j).replace(/\{width}/g,p.width).replace(/\{height}/g,p.height).replace(/\{footer}/g,r).replace(/\{data}/g,b).replace(/\{template}/g,a),m},_previewDefault:function(b,c,d){var e=this,f=e.$preview,h=f.find(".file-live-thumbs");if(e.showPreview){var k,i=b?b.name:"",j=b?b.type:"",l=d===!0&&!e.isUploadable,m=g.createObjectURL(b);e._clearDefaultPreview(),k=e._generatePreviewTemplate("other",m,i,j,c,l,b.size),h.length||(h=a(document.createElement("div")).addClass("file-live-thumbs").appendTo(f)),h.append("\n"+k),d===!0&&e.isUploadable&&e._setThumbStatus(a("#"+c),"Error")}},_previewFile:function(b,c,d,e,f){if(this.showPreview){var q,g=this,h=g._parseFileType(c),i=c?c.name:"",j=g.slug(i),k=g.allowedPreviewTypes,l=g.allowedPreviewMimeTypes,m=g.$preview,n=k&&k.indexOf(h)>=0,o=m.find(".file-live-thumbs"),p="text"===h||"html"===h||"image"===h?d.target.result:f,r=l&&l.indexOf(c.type)!==-1;o.length||(o=a(document.createElement("div")).addClass("file-live-thumbs").appendTo(m)),"html"===h&&g.purifyHtml&&window.DOMPurify&&(p=window.DOMPurify.sanitize(p)),n||r?(q=g._generatePreviewTemplate(h,p,i,c.type,e,!1,c.size),g._clearDefaultPreview(),o.append("\n"+q),g._validateImage(b,e,j,c.type)):g._previewDefault(c,e),g._initSortable()}},_slugDefault:function(a){return da(a)?"":String(a).replace(/[\-\[\]\/\{}:;#%=\(\)\*\+\?\\\^\$\|<>&"']/g,"_")},_readFiles:function(b){this.reader=new FileReader;var r,c=this,d=c.$element,e=c.$preview,f=c.reader,i=c.$previewContainer,j=c.$previewStatus,k=c.msgLoading,m=c.msgProgress,n=c.previewInitId,o=b.length,p=c.fileTypeSettings,q=c.filestack.length,s=c.maxFilePreviewSize&&parseFloat(c.maxFilePreviewSize),t=e.length&&(!s||isNaN(s)),u=function(d,e,f,g){var h=a.extend(!0,{},c._getOutData({},{},b),{id:f,index:g}),i={id:f,index:g,file:e,files:b};return c._previewDefault(e,f,!0),c.isUploadable&&(c.addToStack(void 0),setTimeout(function(){r(g+1)},100)),c._initFileActions(),c.removeFromPreviewOnError&&a("#"+f).remove(),c.isUploadable?c._showUploadError(d,h):c._showError(d,i)};c.loadedImages=[],c.totalImagesCount=0,a.each(b,function(a,b){var d=c.fileTypeSettings.image||ca.image;d&&d(b.type)&&c.totalImagesCount++}),r=function(a){if(da(d.attr("multiple"))&&(o=1),a>=o)return c.isUploadable&&c.filestack.length>0?c._raise("filebatchselected",[c.getFileStack()]):c._raise("filebatchselected",[b]),i.removeClass("file-thumb-loading"),void j.html("");var x,y,A,D,H,I,J,K,v=q+a,w=n+"-"+v,z=b[a],B=z.name?c.slug(z.name):"",C=(z.size||0)/1e3,E="",F=g.createObjectURL(z),G=0,L=c.allowedFileTypes,M=da(L)?"":L.join(", "),N=c.allowedFileExtensions,O=da(N)?"":N.join(", ");if(B===!1)return void r(a+1);if(0===B.length)return I=c.msgInvalidFileName.replace("{name}",ha(z.name)),void(c.isError=u(I,z,w,a));if(da(N)||(E=new RegExp("\\.("+N.join("|")+")$","i")),A=C.toFixed(2),c.maxFileSize>0&&C>c.maxFileSize)return I=c.msgSizeTooLarge.replace("{name}",B).replace("{size}",A).replace("{maxSize}",c.maxFileSize),void(c.isError=u(I,z,w,a));if(null!==c.minFileSize&&C<=l(c.minFileSize))return I=c.msgSizeTooSmall.replace("{name}",B).replace("{size}",A).replace("{minSize}",c.minFileSize),void(c.isError=u(I,z,w,a));if(!da(L)&&ea(L)){for(H=0;H<L.length;H+=1)J=L[H],D=p[J],K=void 0!==D&&D(z.type,B),G+=da(K)?0:K.length;if(0===G)return I=c.msgInvalidFileType.replace("{name}",B).replace("{types}",M),void(c.isError=u(I,z,w,a))}return 0!==G||da(N)||!ea(N)||da(E)||(K=h(B,E),G+=da(K)?0:K.length,0!==G)?c.showPreview?!t&&C>s?(c.addToStack(z),i.addClass("file-thumb-loading"),c._previewDefault(z,w),c._initFileActions(),c._updateFileDetails(o),void r(a+1)):(e.length&&void 0!==FileReader?(j.html(k.replace("{index}",a+1).replace("{files}",o)),i.addClass("file-thumb-loading"),f.onerror=function(a){c._errorHandler(a,B)},f.onload=function(b){c._previewFile(a,z,b,w,F),c._initFileActions()},f.onloadend=function(){I=m.replace("{index}",a+1).replace("{files}",o).replace("{percent}",50).replace("{name}",B),setTimeout(function(){j.html(I),c._updateFileDetails(o),r(a+1)},100),c._raise("fileloaded",[z,w,a,f])},f.onprogress=function(b){if(b.lengthComputable){var c=b.loaded/b.total*100,d=Math.ceil(c);I=m.replace("{index}",a+1).replace("{files}",o).replace("{percent}",d).replace("{name}",B),setTimeout(function(){j.html(I)},100)}},x=fa("text",p,ca.text),y=fa("image",p,ca.image),x(z.type,B)?f.readAsText(z,c.textEncoding):y(z.type,B)?f.readAsDataURL(z):f.readAsArrayBuffer(z)):(c._previewDefault(z,w),setTimeout(function(){r(a+1),c._updateFileDetails(o)},100),c._raise("fileloaded",[z,w,a,f])),void c.addToStack(z)):(c.addToStack(z),setTimeout(function(){r(a+1)},100),void c._raise("fileloaded",[z,w,a,f])):(I=c.msgInvalidFileExtension.replace("{name}",B).replace("{extensions}",O),void(c.isError=u(I,z,w,a)))},r(0),c._updateFileDetails(o,!1)},_updateFileDetails:function(a){var b=this,c=b.$element,d=b.getFileStack(),e=i(9)&&ka(c.val())||c[0].files[0]&&c[0].files[0].name||d.length&&d[0].name||"",f=b.slug(e),g=b.isUploadable?d.length:a,h=k.count(b.id)+g,j=g>1?b._getMsgSelected(h):f;b.isError?(b.$previewContainer.removeClass("file-thumb-loading"),b.$previewStatus.html(""),b.$captionContainer.find(".kv-caption-icon").hide()):b._showFileIcon(),b._setCaption(j,b.isError),b.$container.removeClass("file-input-new file-input-ajax-new"),1===arguments.length&&b._raise("fileselect",[a,f]),k.count(b.id)&&b._initPreviewActions()},_setThumbStatus:function(a,b){var c=this;if(c.showPreview){var d="indicator"+b,e=d+"Title",f="file-preview-"+b.toLowerCase(),g=a.find(".file-upload-indicator"),h=c.fileActionSettings;a.removeClass("file-preview-success file-preview-error file-preview-loading"),"Error"===b&&a.find(".kv-file-upload").attr("disabled",!0),"Success"===b&&(a.find(".file-drag-handle").remove(),g.css("margin-left",0)),g.html(h[d]),g.attr("title",h[e]),a.addClass(f)}},_setProgressCancelled:function(){var a=this;a._setProgress(101,a.$progress,a.msgCancelled)},_setProgress:function(a,b,c){var d=this,e=Math.min(a,100),f=e<100?d.progressTemplate:c?d.progressErrorTemplate:a<=100?d.progressTemplate:d.progressCompleteTemplate,g=d.progressUploadThreshold;if(b=b||d.$progress,!da(f)){if(g&&e>g&&a<=100){var h=f.replace("{percent}",g).replace("{percent}",g).replace("{percent}%",d.msgUploadThreshold);b.html(h)}else b.html(f.replace(/\{percent}/g,e));c&&b.find('[role="progressbar"]').html(c)}},_setFileDropZoneTitle:function(){var d,a=this,b=a.$container.find(".file-drop-zone"),c=a.dropZoneTitle;a.isClickable&&(d=da(a.$element.attr("multiple"))?a.fileSingle:a.filePlural,c+=a.dropZoneClickTitle.replace("{files}",d)),b.find("."+a.dropZoneTitleClass).remove(),a.isUploadable&&a.showPreview&&0!==b.length&&!(a.getFileStack().length>0)&&a.dropZoneEnabled&&(0===b.find(".file-preview-frame").length&&da(a.defaultPreviewContent)&&b.prepend('<div class="'+a.dropZoneTitleClass+'">'+c+"</div>"),a.$container.removeClass("file-input-new"),p(a.$container,"file-input-ajax-new"))},_setAsyncUploadStatus:function(b,c,d){var e=this,f=0;e._setProgress(c,a("#"+b).find(".file-thumb-progress")),e.uploadStatus[b]=c,a.each(e.uploadStatus,function(a,b){f+=b}),e._setProgress(Math.floor(f/d))},_validateMinCount:function(){var a=this,b=a.isUploadable?a.getFileStack().length:a.$element.get(0).files.length;return!(a.validateInitialCount&&a.minFileCount>0&&a._getFileCount(b-1)<a.minFileCount)||(a._noFilesError({}),!1)},_getFileCount:function(a){var b=this,c=0;return b.validateInitialCount&&!b.overwriteInitial&&(c=k.count(b.id),a+=c),a},_getFileName:function(a){return a&&a.name?this.slug(a.name):void 0},_getFileNames:function(a){var b=this;return b.filenames.filter(function(b){return a?void 0!==b:void 0!==b&&null!==b})},_setPreviewError:function(a,b,c){var d=this;void 0!==b&&d.updateStack(b,c),d.removeFromPreviewOnError?a.remove():d._setThumbStatus(a,"Error")},_checkDimensions:function(a,b,c,d,e,f,g){var i,j,m,n,h=this,k="Small"===b?"min":"max",l=h[k+"Image"+f];!da(l)&&c.length&&(m=c[0],j="Width"===f?m.naturalWidth||m.width:m.naturalHeight||m.height,n="Small"===b?j>=l:j<=l,n||(i=h["msgImage"+f+b].replace("{name}",e).replace("{size}",l),h._showUploadError(i,g),h._setPreviewError(d,a,null)))},_validateImage:function(a,b,c,d){var h,i,k,e=this,f=e.$preview,l=f.find("#"+b),m=l.find("img");c=c||"Untitled",m.length&&j(m,"load",function(){i=l.width(),k=f.width(),i>k&&(m.css("width","100%"),l.css("width","97%")),h={ind:a,id:b},e._checkDimensions(a,"Small",m,l,c,"Width",h),e._checkDimensions(a,"Small",m,l,c,"Height",h),e.resizeImage||(e._checkDimensions(a,"Large",m,l,c,"Width",h),e._checkDimensions(a,"Large",m,l,c,"Height",h)),e._raise("fileimageloaded",[b]),e.loadedImages.push({ind:a,img:m,thumb:l,pid:b,typ:d}),e._validateAllImages(),g.revokeObjectURL(m.attr("src"))})},_validateAllImages:function(){var b,c,d,e,f,g,i,a=this,h={};if(a.loadedImages.length===a.totalImagesCount&&(a._raise("fileimagesloaded"),a.resizeImage)){i=a.isUploadable?a._showUploadError:a._showError;var j={val:0};for(b=0;b<a.loadedImages.length;b++)c=a.loadedImages[b],d=c.img,e=c.thumb,f=c.pid,g=c.ind,h={id:f,index:g},a._getResizedImage(d[0],c.typ,f,g,j,a.loadedImages.length)||(i(a.msgImageResizeError,h,"fileimageresizeerror"),a._setPreviewError(e,g))}},_getResizedImage:function(a,b,c,d,e,f){var n,o,g=this,h=a.naturalWidth,i=a.naturalHeight,j=1,k=g.maxImageWidth||h,l=g.maxImageHeight||i,m=h&&i,p=g.imageCanvas,q=g.imageCanvasContext;if(!m)return e.val++,e.val===f&&g._raise("fileimagesresized"),!1;if(h===k&&i===l)return g._raise("fileimageresized",[c,d]),e.val++,e.val===f&&g._raise("fileimagesresized"),!0;b=b||g.resizeDefaultImageType,n=h>k,o=i>l,j="width"===g.resizePreference?n?k/h:o?l/i:1:o?l/i:n?k/h:1,g._resetCanvas(),h*=j,i*=j,p.width=h,p.height=i;try{return q.drawImage(a,0,0,h,i),p.toBlob(function(a){g.filestack[d]=a,g._raise("fileimageresized",[c,d]),e.val++,e.val===f&&g._raise("fileimagesresized",[void 0,void 0])},b,g.resizeQuality),!0}catch(a){return e.val++,e.val===f&&g._raise("fileimagesresized",[void 0,void 0]),!1}},_initBrowse:function(a){var b=this;b.showBrowse?(b.$btnFile=a.find(".btn-file"),b.$btnFile.append(b.$element)):b.$element.hide()},_initCaption:function(){var a=this,b=a.initialCaption||"";return a.overwriteInitial||da(b)?(a.$caption.html(""),!1):(a._setCaption(b),!0)},_setCaption:function(b,c){var e,f,g,h,d=this,i=d.getFileStack();if(d.$caption.length){if(c)e=a("<div>"+d.msgValidationError+"</div>").text(),g=i.length,h=g?1===g&&i[0]?d._getFileNames()[0]:d._getMsgSelected(g):d._getMsgSelected(d.msgNo),f='<span class="'+d.msgValidationErrorClass+'">'+d.msgValidationErrorIcon+(da(b)?h:b)+"</span>";else{if(da(b))return;e=a("<div>"+b+"</div>").text(),f=d._getLayoutTemplate("fileIcon")+e}d.$caption.html(f),d.$caption.attr("title",e),d.$captionContainer.find(".file-caption-ellipsis").attr("title",e)}},_createContainer:function(){var b=this,c=a(document.createElement("div")).attr({class:"file-input file-input-new"}).html(b._renderMain());return b.$element.before(c),b._initBrowse(c),b.theme&&c.addClass("theme-"+b.theme),c},_refreshContainer:function(){var a=this,b=a.$container;b.before(a.$element),b.html(a._renderMain()),a._initBrowse(b)},_renderMain:function(){var a=this,b=a.isUploadable&&a.dropZoneEnabled?" file-drop-zone":"file-drop-disabled",c=a.showClose?a._getLayoutTemplate("close"):"",d=a.showPreview?a._getLayoutTemplate("preview").replace(/\{class}/g,a.previewClass).replace(/\{dropClass}/g,b):"",e=a.isDisabled?a.captionClass+" file-caption-disabled":a.captionClass,f=a.captionTemplate.replace(/\{class}/g,e+" kv-fileinput-caption");return a.mainTemplate.replace(/\{class}/g,a.mainClass+(!a.showBrowse&&a.showCaption?" no-browse":"")).replace(/\{preview}/g,d).replace(/\{close}/g,c).replace(/\{caption}/g,f).replace(/\{upload}/g,a._renderButton("upload")).replace(/\{remove}/g,a._renderButton("remove")).replace(/\{cancel}/g,a._renderButton("cancel")).replace(/\{browse}/g,a._renderButton("browse"))},_renderButton:function(a){var b=this,c=b._getLayoutTemplate("btnDefault"),d=b[a+"Class"],e=b[a+"Title"],f=b[a+"Icon"],g=b[a+"Label"],h=b.isDisabled?" disabled":"",i="button";switch(a){case"remove":if(!b.showRemove)return"";break;case"cancel":if(!b.showCancel)return"";d+=" hide";break;case"upload":if(!b.showUpload)return"";b.isUploadable&&!b.isDisabled?c=b._getLayoutTemplate("btnLink").replace("{href}",b.uploadUrl):i="submit";break;case"browse":if(!b.showBrowse)return"";c=b._getLayoutTemplate("btnBrowse");break;default:return""}return d+="browse"===a?" btn-file":" fileinput-"+a+" fileinput-"+a+"-button",da(g)||(g=' <span class="'+b.buttonLabelClass+'">'+g+"</span>"),c.replace("{type}",i).replace("{css}",d).replace("{title}",e).replace("{status}",h).replace("{icon}",f).replace("{label}",g)},_renderThumbProgress:function(){return'<div class="file-thumb-progress hide">'+this.progressTemplate.replace(/\{percent}/g,"0")+"</div>"},_renderFileFooter:function(a,b,c,d){var k,e=this,f=e.fileActionSettings,g=f.showRemove,h=f.showDrag,i=f.showUpload,j=f.showZoom,l=e._getLayoutTemplate("footer"),m=d?f.indicatorError:f.indicatorNew,n=d?f.indicatorErrorTitle:f.indicatorNewTitle;return b=e._getSize(b),k=e.isUploadable?l.replace(/\{actions}/g,e._renderFileActions(i,g,j,h,!1,!1,!1)).replace(/\{caption}/g,a).replace(/\{size}/g,b).replace(/\{width}/g,c).replace(/\{progress}/g,e._renderThumbProgress()).replace(/\{indicator}/g,m).replace(/\{indicatorTitle}/g,n):l.replace(/\{actions}/g,e._renderFileActions(!1,!1,j,h,!1,!1,!1)).replace(/\{caption}/g,a).replace(/\{size}/g,b).replace(/\{width}/g,c).replace(/\{progress}/g,"").replace(/\{indicator}/g,m).replace(/\{indicatorTitle}/g,n),k=ia(k,e.previewThumbTags)},_renderFileActions:function(a,b,c,d,e,f,g,h){if(!(a||b||c||d))return"";var p,i=this,j=f===!1?"":' data-url="'+f+'"',k=g===!1?"":' data-key="'+g+'"',l="",m="",n="",o="",q=i._getLayoutTemplate("actions"),r=i.fileActionSettings,s=i.otherActionButtons.replace(/\{dataKey}/g,k),t=e?r.removeClass+" disabled":r.removeClass;return b&&(l=i._getLayoutTemplate("actionDelete").replace(/\{removeClass}/g,t).replace(/\{removeIcon}/g,r.removeIcon).replace(/\{removeTitle}/g,r.removeTitle).replace(/\{dataUrl}/g,j).replace(/\{dataKey}/g,k)),a&&(m=i._getLayoutTemplate("actionUpload").replace(/\{uploadClass}/g,r.uploadClass).replace(/\{uploadIcon}/g,r.uploadIcon).replace(/\{uploadTitle}/g,r.uploadTitle)),c&&(n=i._getLayoutTemplate("actionZoom").replace(/\{zoomClass}/g,r.zoomClass).replace(/\{zoomIcon}/g,r.zoomIcon).replace(/\{zoomTitle}/g,r.zoomTitle)),d&&h&&(p="drag-handle-init "+r.dragClass,o=i._getLayoutTemplate("actionDrag").replace(/\{dragClass}/g,p).replace(/\{dragTitle}/g,r.dragTitle).replace(/\{dragIcon}/g,r.dragIcon)),q.replace(/\{delete}/g,l).replace(/\{upload}/g,m).replace(/\{zoom}/g,n).replace(/\{drag}/g,o).replace(/\{other}/g,s)},_browse:function(a){var b=this;b._raise("filebrowse"),a&&a.isDefaultPrevented()||(b.isError&&!b.isUploadable&&b.clear(),b.$captionContainer.focus())},_change:function(b){var c=this,d=c.$element;if(!c.isUploadable&&da(d.val())&&c.fileInputCleared)return void(c.fileInputCleared=!1);c.fileInputCleared=!1;var e,f,g,l,m,n,h=arguments.length>1,i=c.isUploadable,j=0,o=h?b.originalEvent.dataTransfer.files:d.get(0).files,p=c.filestack.length,q=da(d.attr("multiple")),r=q&&p>0,s=0,t=function(b,d,e,f){var g=a.extend(!0,{},c._getOutData({},{},o),{id:e,index:f}),h={id:e,index:f,file:d,files:o};return c.isUploadable?c._showUploadError(b,g):c._showError(b,h)};if(c.reader=null,c._resetUpload(),c._hideFileIcon(),c.isUploadable&&c.$container.find(".file-drop-zone ."+c.dropZoneTitleClass).remove(),h)for(e=[];o[j];)l=o[j],l.type||l.size%4096!==0?e.push(l):s++,j++;else e=void 0===b.target.files?b.target&&b.target.value?[{name:b.target.value.replace(/^.+\\/,"")}]:[]:b.target.files;if(da(e)||0===e.length)return i||c.clear(),c._showFolderError(s),void c._raise("fileselectnone");if(c._resetErrors(),n=e.length,g=c._getFileCount(c.isUploadable?c.getFileStack().length+n:n),c.maxFileCount>0&&g>c.maxFileCount){if(!c.autoReplace||n>c.maxFileCount)return m=c.autoReplace&&n>c.maxFileCount?n:g,f=c.msgFilesTooMany.replace("{m}",c.maxFileCount).replace("{n}",m),c.isError=t(f,null,null,null),c.$captionContainer.find(".kv-caption-icon").hide(),c._setCaption("",!0),void c.$container.removeClass("file-input-new file-input-ajax-new");g>c.maxFileCount&&c._resetPreviewThumbs(i)}else!i||r?(c._resetPreviewThumbs(!1),r&&c.clearStack()):!i||0!==p||k.count(c.id)&&!c.overwriteInitial||c._resetPreviewThumbs(!0);c.isPreviewable?c._readFiles(e):c._updateFileDetails(1),c._showFolderError(s)},_abort:function(b){var d,c=this;return!(!c.ajaxAborted||"object"!=typeof c.ajaxAborted||void 0===c.ajaxAborted.message)&&(d=a.extend(!0,{},c._getOutData(),b),d.abortData=c.ajaxAborted.data||{},d.abortMessage=c.ajaxAborted.message,c.cancel(),c._setProgress(101,c.$progress,c.msgCancelled),c._showUploadError(c.ajaxAborted.message,d,"filecustomerror"),!0)},_resetFileStack:function(){var b=this,c=0,d=[],e=[];b._getThumbs().each(function(){var f=a(this),g=f.attr("data-fileindex"),h=b.filestack[g];g!==-1&&(void 0!==h?(d[c]=h,e[c]=b._getFileName(h),f.attr({id:b.previewInitId+"-"+c,"data-fileindex":c}),c++):f.attr({id:"uploaded-"+ga(),"data-fileindex":"-1"}))}),b.filestack=d,b.filenames=e},clearStack:function(){var a=this;return a.filestack=[],a.filenames=[],a.$element},updateStack:function(a,b){var c=this;return c.filestack[a]=b,c.filenames[a]=c._getFileName(b),c.$element},addToStack:function(a){var b=this;return b.filestack.push(a),b.filenames.push(b._getFileName(a)),b.$element},getFileStack:function(a){var b=this;return b.filestack.filter(function(b){return a?void 0!==b:void 0!==b&&null!==b})},getFilesCount:function(){var a=this,b=a.isUploadable?a.getFileStack().length:a.$element.get(0).files.length;return a._getFileCount(b)},lock:function(){var a=this;return a._resetErrors(),a.disable(),a.showRemove&&p(a.$container.find(".fileinput-remove"),"hide"),a.showCancel&&a.$container.find(".fileinput-cancel").removeClass("hide"),a._raise("filelock",[a.filestack,a._getExtraData()]),a.$element},unlock:function(a){var b=this;return void 0===a&&(a=!0),b.enable(),b.showCancel&&p(b.$container.find(".fileinput-cancel"),"hide"),b.showRemove&&b.$container.find(".fileinput-remove").removeClass("hide"),a&&b._resetFileStack(),b._raise("fileunlock",[b.filestack,b._getExtraData()]),b.$element},cancel:function(){var e,b=this,c=b.ajaxRequests,d=c.length;if(d>0)for(e=0;e<d;e+=1)b.cancelling=!0,c[e].abort();return b._setProgressCancelled(),b._getThumbs().each(function(){var c=a(this),d=c.attr("data-fileindex");c.removeClass("file-uploading"),void 0!==b.filestack[d]&&(c.find(".kv-file-upload").removeClass("disabled").removeAttr("disabled"),c.find(".kv-file-remove").removeClass("disabled").removeAttr("disabled")),
+    b.unlock()}),b.$element},clear:function(){var c,b=this;return b.$btnUpload.removeAttr("disabled"),b._getThumbs().find("video,audio,img").each(function(){ja(a(this))}),b._resetUpload(),b.clearStack(),b._clearFileInput(),b._resetErrors(!0),b._raise("fileclear"),b._hasInitialPreview()?(b._showFileIcon(),b._resetPreview(),b._initPreviewActions(),b.$container.removeClass("file-input-new")):(b._getThumbs().each(function(){b._clearObjects(a(this))}),b.isUploadable&&(k.data[b.id]={}),b.$preview.html(""),c=!b.overwriteInitial&&b.initialCaption.length>0?b.initialCaption:"",b.$caption.html(c),b.$caption.attr("title",""),p(b.$container,"file-input-new"),b._validateDefaultPreview()),0===b.$container.find(".file-preview-frame").length&&(b._initCaption()||b.$captionContainer.find(".kv-caption-icon").hide()),b._hideFileIcon(),b._raise("filecleared"),b.$captionContainer.focus(),b._setFileDropZoneTitle(),b.$element},reset:function(){var a=this;return a._resetPreview(),a.$container.find(".fileinput-filename").text(""),a._raise("filereset"),p(a.$container,"file-input-new"),(a.$preview.find(".file-preview-frame").length||a.isUploadable&&a.dropZoneEnabled)&&a.$container.removeClass("file-input-new"),a._setFileDropZoneTitle(),a.clearStack(),a.formdata={},a.$element},disable:function(){var a=this;return a.isDisabled=!0,a._raise("filedisabled"),a.$element.attr("disabled","disabled"),a.$container.find(".kv-fileinput-caption").addClass("file-caption-disabled"),a.$container.find(".btn-file, .fileinput-remove, .fileinput-upload, .file-preview-frame button").attr("disabled",!0),a._initDragDrop(),a.$element},enable:function(){var a=this;return a.isDisabled=!1,a._raise("fileenabled"),a.$element.removeAttr("disabled"),a.$container.find(".kv-fileinput-caption").removeClass("file-caption-disabled"),a.$container.find(".btn-file, .fileinput-remove, .fileinput-upload, .file-preview-frame button").removeAttr("disabled"),a._initDragDrop(),a.$element},upload:function(){var e,f,g,b=this,c=b.getFileStack().length,d={},h=!a.isEmptyObject(b._getExtraData());if(b.minFileCount>0&&b._getFileCount(c)<b.minFileCount)return void b._noFilesError(d);if(b.isUploadable&&!b.isDisabled&&(0!==c||h)){if(b._resetUpload(),b.$progress.removeClass("hide"),b.uploadCount=0,b.uploadStatus={},b.uploadLog=[],b.lock(),b._setProgress(2),0===c&&h)return void b._uploadExtraOnly();if(g=b.filestack.length,b.hasInitData=!1,!b.uploadAsync)return b._uploadBatch(),b.$element;for(f=b._getOutData(),b._raise("filebatchpreupload",[f]),b.fileBatchCompleted=!1,b.uploadCache={content:[],config:[],tags:[],append:!0},b.uploadAsyncCount=b.getFileStack().length,e=0;e<g;e++)b.uploadCache.content[e]=null,b.uploadCache.config[e]=null,b.uploadCache.tags[e]=null;for(e=0;e<g;e++)void 0!==b.filestack[e]&&b._uploadSingle(e,b.filestack,!0)}},destroy:function(){var a=this,c=a.$container;return c.find(".file-drop-zone").off(),a.$element.insertBefore(c).off(b).removeData(),c.off().remove(),a.$element},refresh:function(b){var c=this,d=c.$element;return b=b?a.extend(!0,{},c.options,b):c.options,c.destroy(),d.fileinput(b),d.val()&&d.trigger("change.fileinput"),d}},a.fn.fileinput=function(b){if(m()||i(9)){var c=Array.apply(null,arguments),d=[];switch(c.shift(),this.each(function(){var l,e=a(this),f=e.data("fileinput"),g="object"==typeof b&&b,h=g.theme||e.data("theme"),i={},j={},k=g.language||e.data("language")||"en";f||(h&&(j=a.fn.fileinputThemes[h]||{}),"en"===k||da(a.fn.fileinputLocales[k])||(i=a.fn.fileinputLocales[k]||{}),l=a.extend(!0,{},a.fn.fileinput.defaults,j,a.fn.fileinputLocales.en,i,g,e.data()),f=new oa(this,l),e.data("fileinput",f)),"string"==typeof b&&d.push(f[b].apply(f,c))}),d.length){case 0:return this;case 1:return d[0];default:return d}}},a.fn.fileinput.defaults={language:"en",showCaption:!0,showBrowse:!0,showPreview:!0,showRemove:!0,showUpload:!0,showCancel:!0,showClose:!0,showUploadedThumbs:!0,browseOnZoneClick:!1,autoReplace:!1,previewClass:"",captionClass:"",mainClass:"file-caption-main",mainTemplate:null,purifyHtml:!0,fileSizeGetter:null,initialCaption:"",initialPreview:[],initialPreviewDelimiter:"*$$*",initialPreviewAsData:!1,initialPreviewFileType:"image",initialPreviewConfig:[],initialPreviewThumbTags:[],previewThumbTags:{},initialPreviewShowDelete:!0,removeFromPreviewOnError:!1,deleteUrl:"",deleteExtraData:{},overwriteInitial:!0,layoutTemplates:Y,previewTemplates:Z,previewZoomSettings:$,previewZoomButtonIcons:{prev:'<i class="glyphicon glyphicon-triangle-left"></i>',next:'<i class="glyphicon glyphicon-triangle-right"></i>',toggleheader:'<i class="glyphicon glyphicon-resize-vertical"></i>',fullscreen:'<i class="glyphicon glyphicon-fullscreen"></i>',borderless:'<i class="glyphicon glyphicon-resize-full"></i>',close:'<i class="glyphicon glyphicon-remove"></i>'},previewZoomButtonClasses:{prev:"btn btn-navigate",next:"btn btn-navigate",toggleheader:"btn btn-default btn-header-toggle",fullscreen:"btn btn-default",borderless:"btn btn-default",close:"btn btn-default"},allowedPreviewTypes:_,allowedPreviewMimeTypes:null,allowedFileTypes:null,allowedFileExtensions:null,defaultPreviewContent:null,customLayoutTags:{},customPreviewTags:{},previewSettings:ba,fileTypeSettings:ca,previewFileIcon:'<i class="glyphicon glyphicon-file"></i>',previewFileIconClass:"file-other-icon",previewFileIconSettings:{},previewFileExtSettings:{},buttonLabelClass:"hidden-xs",browseIcon:'<i class="glyphicon glyphicon-folder-open"></i>&nbsp;',browseClass:"btn btn-primary",removeIcon:'<i class="glyphicon glyphicon-trash"></i>',removeClass:"btn btn-default",cancelIcon:'<i class="glyphicon glyphicon-ban-circle"></i>',cancelClass:"btn btn-default",uploadIcon:'<i class="glyphicon glyphicon-upload"></i>',uploadClass:"btn btn-default",uploadUrl:null,uploadAsync:!0,uploadExtraData:{},zoomModalHeight:480,minImageWidth:null,minImageHeight:null,maxImageWidth:null,maxImageHeight:null,resizeImage:!1,resizePreference:"width",resizeQuality:.92,resizeDefaultImageType:"image/jpeg",minFileSize:0,maxFileSize:0,maxFilePreviewSize:25600,minFileCount:0,maxFileCount:0,validateInitialCount:!1,msgValidationErrorClass:"text-danger",msgValidationErrorIcon:'<i class="glyphicon glyphicon-exclamation-sign"></i> ',msgErrorClass:"file-error-message",progressThumbClass:"progress-bar progress-bar-success progress-bar-striped active",progressClass:"progress-bar progress-bar-success progress-bar-striped active",progressCompleteClass:"progress-bar progress-bar-success",progressErrorClass:"progress-bar progress-bar-danger",progressUploadThreshold:99,previewFileType:"image",elCaptionContainer:null,elCaptionText:null,elPreviewContainer:null,elPreviewImage:null,elPreviewStatus:null,elErrorContainer:null,errorCloseButton:'<span class="close kv-error-close">&times;</span>',slugCallback:null,dropZoneEnabled:!0,dropZoneTitleClass:"file-drop-zone-title",fileActionSettings:{},otherActionButtons:"",textEncoding:"UTF-8",ajaxSettings:{},ajaxDeleteSettings:{},showAjaxErrorDetails:!0},a.fn.fileinputLocales.en={fileSingle:"file",filePlural:"files",browseLabel:"Browse &hellip;",removeLabel:"Remove",removeTitle:"Clear selected files",cancelLabel:"Cancel",cancelTitle:"Abort ongoing upload",uploadLabel:"Upload",uploadTitle:"Upload selected files",msgNo:"No",msgNoFilesSelected:"No files selected",msgCancelled:"Cancelled",msgZoomModalHeading:"Detailed Preview",msgSizeTooSmall:'File "{name}" (<b>{size} KB</b>) is too small and must be larger than <b>{minSize} KB</b>.',msgSizeTooLarge:'File "{name}" (<b>{size} KB</b>) exceeds maximum allowed upload size of <b>{maxSize} KB</b>.',msgFilesTooLess:"You must select at least <b>{n}</b> {files} to upload.",msgFilesTooMany:"Number of files selected for upload <b>({n})</b> exceeds maximum allowed limit of <b>{m}</b>.",msgFileNotFound:'File "{name}" not found!',msgFileSecured:'Security restrictions prevent reading the file "{name}".',msgFileNotReadable:'File "{name}" is not readable.',msgFilePreviewAborted:'File preview aborted for "{name}".',msgFilePreviewError:'An error occurred while reading the file "{name}".',msgInvalidFileName:'Invalid or unsupported characters in file name "{name}".',msgInvalidFileType:'Invalid type for file "{name}". Only "{types}" files are supported.',msgInvalidFileExtension:'Invalid extension for file "{name}". Only "{extensions}" files are supported.',msgUploadAborted:"The file upload was aborted",msgUploadThreshold:"Processing...",msgValidationError:"Validation Error",msgLoading:"Loading file {index} of {files} &hellip;",msgProgress:"Loading file {index} of {files} - {name} - {percent}% completed.",msgSelected:"{n} {files} selected",msgFoldersNotAllowed:"Drag & drop files only! {n} folder(s) dropped were skipped.",msgImageWidthSmall:'Width of image file "{name}" must be at least {size} px.',msgImageHeightSmall:'Height of image file "{name}" must be at least {size} px.',msgImageWidthLarge:'Width of image file "{name}" cannot exceed {size} px.',msgImageHeightLarge:'Height of image file "{name}" cannot exceed {size} px.',msgImageResizeError:"Could not get the image dimensions to resize.",msgImageResizeException:"Error while resizing the image.<pre>{errors}</pre>",dropZoneTitle:"Drag & drop files here &hellip;",dropZoneClickTitle:"<br>(or click to select {files})",previewZoomButtonTitles:{prev:"View previous file",next:"View next file",toggleheader:"Toggle header",fullscreen:"Toggle full screen",borderless:"Toggle borderless mode",close:"Close detailed preview"}},a.fn.fileinput.Constructor=oa,a(document).ready(function(){var b=a("input.file[type=file]");b.length&&b.fileinput()})});
 \ No newline at end of file
+/*!
+ * FileInput Chinese Translations
+ *
+ * This file must be loaded after 'fileinput.js'. Patterns in braces '{}', or
+ * any HTML markup tags in the messages must not be converted or translated.
+ *
+ * @see http://github.com/kartik-v/bootstrap-fileinput
+ * @author kangqf <kangqingfei@gmail.com>
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+(function ($) {
+    "use strict";
+
+    $.fn.fileinputLocales['zh'] = {
+        fileSingle: '文件',
+        filePlural: '个文件',
+        browseLabel: '打开 &hellip;',
+        removeLabel: '移除',
+        removeTitle: '清除选中文件',
+        cancelLabel: '取消',
+        cancelTitle: '取消进行中的上传',
+        uploadLabel: '上传',
+        uploadTitle: '上传选中文件',
+        msgNo: '没有',
+        msgNoFilesSelected: '',
+        msgCancelled: '取消',
+        msgZoomModalHeading: '详细预览',
+        msgSizeTooSmall: 'File "{name}" (<b>{size} KB</b>) is too small and must be larger than <b>{minSize} KB</b>.',
+        msgSizeTooLarge: '文件 "{name}" (<b>{size} KB</b>) 超过了允许大小 <b>{maxSize} KB</b>.',
+        msgFilesTooLess: '你必须选择最少 <b>{n}</b> {files} 来上传. ',
+        msgFilesTooMany: '选择的上传文件个数 <b>({n})</b> 超出最大文件的限制个数 <b>{m}</b>.',
+        msgFileNotFound: '文件 "{name}" 未找到!',
+        msgFileSecured: '安全限制，为了防止读取文件 "{name}".',
+        msgFileNotReadable: '文件 "{name}" 不可读.',
+        msgFilePreviewAborted: '取消 "{name}" 的预览.',
+        msgFilePreviewError: '读取 "{name}" 时出现了一个错误.',
+        msgInvalidFileName: 'Invalid or unsupported characters in file name "{name}".',
+        msgInvalidFileType: '不正确的类型 "{name}". 只支持 "{types}" 类型的文件.',
+        msgInvalidFileExtension: '不正确的文件扩展名 "{name}". 只支持 "{extensions}" 的文件扩展名.',
+        msgUploadAborted: '该文件上传被中止',
+        msgUploadThreshold: 'Processing...',
+        msgValidationError: '验证错误',
+        msgLoading: '加载第 {index} 文件 共 {files} &hellip;',
+        msgProgress: '加载第 {index} 文件 共 {files} - {name} - {percent}% 完成.',
+        msgSelected: '{n} {files} 选中',
+        msgFoldersNotAllowed: '只支持拖拽文件! 跳过 {n} 拖拽的文件夹.',
+        msgImageWidthSmall: '宽度的图像文件的"{name}"的必须是至少{size}像素.',
+        msgImageHeightSmall: '图像文件的"{name}"的高度必须至少为{size}像素.',
+        msgImageWidthLarge: '宽度的图像文件"{name}"不能超过{size}像素.',
+        msgImageHeightLarge: '图像文件"{name}"的高度不能超过{size}像素.',
+        msgImageResizeError: '无法获取的图像尺寸调整。',
+        msgImageResizeException: '错误而调整图像大小。<pre>{errors}</pre>',
+        dropZoneTitle: '拖拽文件到这里 &hellip;<br>支持多文件同时上传',
+        dropZoneClickTitle: '<br>(或点击{files}按钮选择文件)',
+        fileActionSettings: {
+            removeTitle: '删除文件',
+            uploadTitle: '上传文件',
+            zoomTitle: '查看详情',
+            dragTitle: '移动 / 重置',
+            indicatorNewTitle: '没有上传',
+            indicatorSuccessTitle: '上传',
+            indicatorErrorTitle: '上传错误',
+            indicatorLoadingTitle: '上传 ...'
+        },
+        previewZoomButtonTitles: {
+            prev: '预览上一个文件',
+            next: '预览下一个文件',
+            toggleheader: '缩放',
+            fullscreen: '全屏',
+            borderless: '无边界模式',
+            close: '关闭当前预览'
+        }
+    };
+})(window.jQuery);
 \ No newline at end of file
+(function(e){"use strict";var t=typeof window==="undefined"?null:window;if(typeof define==="function"&&define.amd){define(function(){return e(t)})}else if(typeof module!=="undefined"){module.exports=e(t)}else{t.DOMPurify=e(t)}})(function e(t){"use strict";var r=function(t){return e(t)};r.version="0.7.4";if(!t||!t.document||t.document.nodeType!==9){r.isSupported=false;return r}var n=t.document;var a=n;var i=t.DocumentFragment;var o=t.HTMLTemplateElement;var l=t.NodeFilter;var s=t.NamedNodeMap||t.MozNamedAttrMap;var f=t.Text;var c=t.Comment;var u=t.DOMParser;if(typeof o==="function"){var d=n.createElement("template");if(d.content&&d.content.ownerDocument){n=d.content.ownerDocument}}var m=n.implementation;var p=n.createNodeIterator;var h=n.getElementsByTagName;var v=n.createDocumentFragment;var g=a.importNode;var y={};r.isSupported=typeof m.createHTMLDocument!=="undefined"&&n.documentMode!==9;var b=function(e,t){var r=t.length;while(r--){if(typeof t[r]==="string"){t[r]=t[r].toLowerCase()}e[t[r]]=true}return e};var T=function(e){var t={};var r;for(r in e){if(e.hasOwnProperty(r)){t[r]=e[r]}}return t};var x=null;var k=b({},["a","abbr","acronym","address","area","article","aside","audio","b","bdi","bdo","big","blink","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","content","data","datalist","dd","decorator","del","details","dfn","dir","div","dl","dt","element","em","fieldset","figcaption","figure","font","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","img","input","ins","kbd","label","legend","li","main","map","mark","marquee","menu","menuitem","meter","nav","nobr","ol","optgroup","option","output","p","pre","progress","q","rp","rt","ruby","s","samp","section","select","shadow","small","source","spacer","span","strike","strong","style","sub","summary","sup","table","tbody","td","template","textarea","tfoot","th","thead","time","tr","track","tt","u","ul","var","video","wbr","svg","altglyph","altglyphdef","altglyphitem","animatecolor","animatemotion","animatetransform","circle","clippath","defs","desc","ellipse","filter","font","g","glyph","glyphref","hkern","image","line","lineargradient","marker","mask","metadata","mpath","path","pattern","polygon","polyline","radialgradient","rect","stop","switch","symbol","text","textpath","title","tref","tspan","view","vkern","feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feMerge","feMergeNode","feMorphology","feOffset","feSpecularLighting","feTile","feTurbulence","math","menclose","merror","mfenced","mfrac","mglyph","mi","mlabeledtr","mmuliscripts","mn","mo","mover","mpadded","mphantom","mroot","mrow","ms","mpspace","msqrt","mystyle","msub","msup","msubsup","mtable","mtd","mtext","mtr","munder","munderover","#text"]);var A=null;var w=b({},["accept","action","align","alt","autocomplete","background","bgcolor","border","cellpadding","cellspacing","checked","cite","class","clear","color","cols","colspan","coords","datetime","default","dir","disabled","download","enctype","face","for","headers","height","hidden","high","href","hreflang","id","ismap","label","lang","list","loop","low","max","maxlength","media","method","min","multiple","name","noshade","novalidate","nowrap","open","optimum","pattern","placeholder","poster","preload","pubdate","radiogroup","readonly","rel","required","rev","reversed","rows","rowspan","spellcheck","scope","selected","shape","size","span","srclang","start","src","step","style","summary","tabindex","title","type","usemap","valign","value","width","xmlns","accent-height","accumulate","additivive","alignment-baseline","ascent","attributename","attributetype","azimuth","basefrequency","baseline-shift","begin","bias","by","clip","clip-path","clip-rule","color","color-interpolation","color-interpolation-filters","color-profile","color-rendering","cx","cy","d","dx","dy","diffuseconstant","direction","display","divisor","dur","edgemode","elevation","end","fill","fill-opacity","fill-rule","filter","flood-color","flood-opacity","font-family","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-weight","fx","fy","g1","g2","glyph-name","glyphref","gradientunits","gradienttransform","image-rendering","in","in2","k","k1","k2","k3","k4","kerning","keypoints","keysplines","keytimes","lengthadjust","letter-spacing","kernelmatrix","kernelunitlength","lighting-color","local","marker-end","marker-mid","marker-start","markerheight","markerunits","markerwidth","maskcontentunits","maskunits","max","mask","mode","min","numoctaves","offset","operator","opacity","order","orient","orientation","origin","overflow","paint-order","path","pathlength","patterncontentunits","patterntransform","patternunits","points","preservealpha","r","rx","ry","radius","refx","refy","repeatcount","repeatdur","restart","result","rotate","scale","seed","shape-rendering","specularconstant","specularexponent","spreadmethod","stddeviation","stitchtiles","stop-color","stop-opacity","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke","stroke-width","surfacescale","targetx","targety","transform","text-anchor","text-decoration","text-rendering","textlength","u1","u2","unicode","values","viewbox","visibility","vert-adv-y","vert-origin-x","vert-origin-y","word-spacing","wrap","writing-mode","xchannelselector","ychannelselector","x","x1","x2","y","y1","y2","z","zoomandpan","accent","accentunder","bevelled","close","columnsalign","columnlines","columnspan","denomalign","depth","display","displaystyle","fence","frame","largeop","length","linethickness","lspace","lquote","mathbackground","mathcolor","mathsize","mathvariant","maxsize","minsize","movablelimits","notation","numalign","open","rowalign","rowlines","rowspacing","rowspan","rspace","rquote","scriptlevel","scriptminsize","scriptsizemultiplier","selection","separator","separators","stretchy","subscriptshift","supscriptshift","symmetric","voffset","xlink:href","xml:id","xlink:title","xml:space","xmlns:xlink"]);var E=null;var S=null;var M=true;var O=false;var L=false;var D=false;var N=/\{\{[\s\S]*|[\s\S]*\}\}/gm;var _=/<%[\s\S]*|[\s\S]*%>/gm;var C=false;var z=false;var R=false;var F=false;var H=true;var B=true;var W=b({},["audio","head","math","script","style","svg","video"]);var j=b({},["audio","video","img","source"]);var G=b({},["alt","class","for","id","label","name","pattern","placeholder","summary","title","value","style","xmlns"]);var I=null;var q=n.createElement("form");var P=function(e){if(typeof e!=="object"){e={}}x="ALLOWED_TAGS"in e?b({},e.ALLOWED_TAGS):k;A="ALLOWED_ATTR"in e?b({},e.ALLOWED_ATTR):w;E="FORBID_TAGS"in e?b({},e.FORBID_TAGS):{};S="FORBID_ATTR"in e?b({},e.FORBID_ATTR):{};M=e.ALLOW_DATA_ATTR!==false;O=e.ALLOW_UNKNOWN_PROTOCOLS||false;L=e.SAFE_FOR_JQUERY||false;D=e.SAFE_FOR_TEMPLATES||false;C=e.WHOLE_DOCUMENT||false;z=e.RETURN_DOM||false;R=e.RETURN_DOM_FRAGMENT||false;F=e.RETURN_DOM_IMPORT||false;H=e.SANITIZE_DOM!==false;B=e.KEEP_CONTENT!==false;if(D){M=false}if(R){z=true}if(e.ADD_TAGS){if(x===k){x=T(x)}b(x,e.ADD_TAGS)}if(e.ADD_ATTR){if(A===w){A=T(A)}b(A,e.ADD_ATTR)}if(B){x["#text"]=true}if(Object&&"freeze"in Object){Object.freeze(e)}I=e};var U=function(e){try{e.parentNode.removeChild(e)}catch(t){e.outerHTML=""}};var V=function(e){var t,r;try{t=(new u).parseFromString(e,"text/html")}catch(n){}if(!t){t=m.createHTMLDocument("");r=t.body;r.parentNode.removeChild(r.parentNode.firstElementChild);r.outerHTML=e}if(typeof t.getElementsByTagName==="function"){return t.getElementsByTagName(C?"html":"body")[0]}return h.call(t,C?"html":"body")[0]};var K=function(e){return p.call(e.ownerDocument||e,e,l.SHOW_ELEMENT|l.SHOW_COMMENT|l.SHOW_TEXT,function(){return l.FILTER_ACCEPT},false)};var J=function(e){if(e instanceof f||e instanceof c){return false}if(typeof e.nodeName!=="string"||typeof e.textContent!=="string"||typeof e.removeChild!=="function"||!(e.attributes instanceof s)||typeof e.removeAttribute!=="function"||typeof e.setAttribute!=="function"){return true}return false};var Q=function(e){var t,r;re("beforeSanitizeElements",e,null);if(J(e)){U(e);return true}t=e.nodeName.toLowerCase();re("uponSanitizeElement",e,{tagName:t});if(!x[t]||E[t]){if(B&&!W[t]&&typeof e.insertAdjacentHTML==="function"){try{e.insertAdjacentHTML("AfterEnd",e.innerHTML)}catch(n){}}U(e);return true}if(L&&!e.firstElementChild&&(!e.content||!e.content.firstElementChild)){e.innerHTML=e.textContent.replace(/</g,"&lt;")}if(D&&e.nodeType===3){r=e.textContent;r=r.replace(N," ");r=r.replace(_," ");e.textContent=r}re("afterSanitizeElements",e,null);return false};var X=/^data-[\w.\u00B7-\uFFFF-]/;var Y=/^(?:(?:(?:f|ht)tps?|mailto|tel):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i;var Z=/^(?:\w+script|data):/i;var $=/[\x00-\x20\xA0\u1680\u180E\u2000-\u2029\u205f\u3000]/g;var ee=function(e){var r,a,i,o,l,s,f,c;re("beforeSanitizeAttributes",e,null);s=e.attributes;if(!s){return}f={attrName:"",attrValue:"",keepAttr:true};c=s.length;while(c--){r=s[c];a=r.name;i=r.value;o=a.toLowerCase();f.attrName=o;f.attrValue=i;f.keepAttr=true;re("uponSanitizeAttribute",e,f);i=f.attrValue;if(o==="name"&&e.nodeName==="IMG"&&s.id){l=s.id;s=Array.prototype.slice.apply(s);e.removeAttribute("id");e.removeAttribute(a);if(s.indexOf(l)>c){e.setAttribute("id",l.value)}}else{if(a==="id"){e.setAttribute(a,"")}e.removeAttribute(a)}if(!f.keepAttr){continue}if(H&&(o==="id"||o==="name")&&(i in t||i in n||i in q)){continue}if(D){i=i.replace(N," ");i=i.replace(_," ")}if(A[o]&&!S[o]&&(G[o]||Y.test(i.replace($,""))||o==="src"&&i.indexOf("data:")===0&&j[e.nodeName.toLowerCase()])||M&&X.test(o)||O&&!Z.test(i.replace($,""))){try{e.setAttribute(a,i)}catch(u){}}}re("afterSanitizeAttributes",e,null)};var te=function(e){var t;var r=K(e);re("beforeSanitizeShadowDOM",e,null);while(t=r.nextNode()){re("uponSanitizeShadowNode",t,null);if(Q(t)){continue}if(t.content instanceof i){te(t.content)}ee(t)}re("afterSanitizeShadowDOM",e,null)};var re=function(e,t,n){if(!y[e]){return}y[e].forEach(function(e){e.call(r,t,n,I)})};r.sanitize=function(e,n){var o,l,s,f,c;if(!e){e=""}if(typeof e!=="string"){if(typeof e.toString!=="function"){throw new TypeError("toString is not a function")}else{e=e.toString()}}if(!r.isSupported){if(typeof t.toStaticHTML==="object"||typeof t.toStaticHTML==="function"){return t.toStaticHTML(e)}return e}P(n);if(!z&&!C&&e.indexOf("<")===-1){return e}o=V(e);if(!o){return z?null:""}f=K(o);while(l=f.nextNode()){if(l.nodeType===3&&l===s){continue}if(Q(l)){continue}if(l.content instanceof i){te(l.content)}ee(l);s=l}if(z){if(R){c=v.call(o.ownerDocument);while(o.firstChild){c.appendChild(o.firstChild)}}else{c=o}if(F){c=g.call(a,c,true)}return c}return C?o.outerHTML:o.innerHTML};r.addHook=function(e,t){if(typeof t!=="function"){return}y[e]=y[e]||[];y[e].push(t)};r.removeHook=function(e){if(y[e]){y[e].pop()}};r.removeHooks=function(e){if(y[e]){y[e]=[]}};r.removeAllHooks=function(){y=[]};return r});
+//# sourceMappingURL=./dist/purify.min.js.map
 \ No newline at end of file
+/*! Sortable 1.4.2 - MIT | git://github.com/rubaxa/Sortable.git */
+!function(t){"use strict";"function"==typeof define&&define.amd?define(t):"undefined"!=typeof module&&"undefined"!=typeof module.exports?module.exports=t():"undefined"!=typeof Package?KvSortable=t():window.KvSortable=t()}(function(){"use strict";function t(t,e){if(!t||!t.nodeType||1!==t.nodeType)throw"KvSortable: `el` must be HTMLElement, and not "+{}.toString.call(t);this.el=t,this.options=e=b({},e),t[j]=this;var n={group:Math.random(),sort:!0,disabled:!1,store:null,handle:null,scroll:!0,scrollSensitivity:30,scrollSpeed:10,draggable:/[uo]l/i.test(t.nodeName)?"li":">*",ghostClass:"kvsortable-ghost",chosenClass:"kvsortable-chosen",ignore:"a, img",filter:null,animation:0,setData:function(t,e){t.setData("Text",e.textContent)},dropBubble:!1,dragoverBubble:!1,dataIdAttr:"data-id",delay:0,forceFallback:!1,fallbackClass:"kvsortable-fallback",fallbackOnBody:!1};for(var i in n)!(i in e)&&(e[i]=n[i]);z(e);for(var r in this)"_"===r.charAt(0)&&(this[r]=this[r].bind(this));this.nativeDraggable=e.forceFallback?!1:P,o(t,"mousedown",this._onTapStart),o(t,"touchstart",this._onTapStart),this.nativeDraggable&&(o(t,"dragover",this),o(t,"dragenter",this)),q.push(this._onDragOver),e.store&&this.sort(e.store.get(this))}function e(t){w&&w.state!==t&&(s(w,"display",t?"none":""),!t&&w.state&&S.insertBefore(w,_),w.state=t)}function n(t,e,n){if(t){n=n||U;do if(">*"===e&&t.parentNode===n||v(t,e))return t;while(t!==n&&(t=t.parentNode))}return null}function i(t){t.dataTransfer&&(t.dataTransfer.dropEffect="move"),t.preventDefault()}function o(t,e,n){t.addEventListener(e,n,!1)}function r(t,e,n){t.removeEventListener(e,n,!1)}function a(t,e,n){if(t)if(t.classList)t.classList[n?"add":"remove"](e);else{var i=(" "+t.className+" ").replace(M," ").replace(" "+e+" "," ");t.className=(i+(n?" "+e:"")).replace(M," ")}}function s(t,e,n){var i=t&&t.style;if(i){if(void 0===n)return U.defaultView&&U.defaultView.getComputedStyle?n=U.defaultView.getComputedStyle(t,""):t.currentStyle&&(n=t.currentStyle),void 0===e?n:n[e];e in i||(e="-webkit-"+e),i[e]=n+("string"==typeof n?"":"px")}}function l(t,e,n){if(t){var i=t.getElementsByTagName(e),o=0,r=i.length;if(n)for(;r>o;o++)n(i[o],o);return i}return[]}function d(t,e,n,i,o,r,a){var s=U.createEvent("Event"),l=(t||e[j]).options,d="on"+n.charAt(0).toUpperCase()+n.substr(1);s.initEvent(n,!0,!0),s.to=e,s.from=o||e,s.item=i||e,s.clone=w,s.oldIndex=r,s.newIndex=a,e.dispatchEvent(s),l[d]&&l[d].call(t,s)}function c(t,e,n,i,o,r){var a,s,l=t[j],d=l.options.onMove;return a=U.createEvent("Event"),a.initEvent("move",!0,!0),a.to=e,a.from=t,a.dragged=n,a.draggedRect=i,a.related=o||e,a.relatedRect=r||e.getBoundingClientRect(),t.dispatchEvent(a),d&&(s=d.call(l,a)),s}function u(t){t.draggable=!1}function h(){K=!1}function f(t,e){var n=t.lastElementChild,i=n.getBoundingClientRect();return(e.clientY-(i.top+i.height)>5||e.clientX-(i.right+i.width)>5)&&n}function p(t){for(var e=t.tagName+t.className+t.src+t.href+t.textContent,n=e.length,i=0;n--;)i+=e.charCodeAt(n);return i.toString(36)}function g(t,e){var n=0;if(!t||!t.parentNode)return-1;for(;t&&(t=t.previousElementSibling);)"TEMPLATE"!==t.nodeName.toUpperCase()&&v(t,e)&&n++;return n}function v(t,e){if(t){e=e.split(".");var n=e.shift().toUpperCase(),i=new RegExp("\\s("+e.join("|")+")(?=\\s)","g");return!(""!==n&&t.nodeName.toUpperCase()!=n||e.length&&((" "+t.className+" ").match(i)||[]).length!=e.length)}return!1}function m(t,e){var n,i;return function(){void 0===n&&(n=arguments,i=this,setTimeout(function(){1===n.length?t.call(i,n[0]):t.apply(i,n),n=void 0},e))}}function b(t,e){if(t&&e)for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t}if("undefined"==typeof window||"undefined"==typeof window.document)return function(){throw new Error("sortable.js requires a window with a document")};var _,D,y,w,S,T,C,E,x,N,B,k,O,X,Y,A,I,R={},M=/\s+/g,j="KvSortable"+(new Date).getTime(),L=window,U=L.document,H=L.parseInt,P=!!("draggable"in U.createElement("div")),W=function(t){return t=U.createElement("x"),t.style.cssText="pointer-events:auto","auto"===t.style.pointerEvents}(),K=!1,F=Math.abs,q=([].slice,[]),V=m(function(t,e,n){if(n&&e.scroll){var i,o,r,a,s=e.scrollSensitivity,l=e.scrollSpeed,d=t.clientX,c=t.clientY,u=window.innerWidth,h=window.innerHeight;if(E!==n&&(C=e.scroll,E=n,C===!0)){C=n;do if(C.offsetWidth<C.scrollWidth||C.offsetHeight<C.scrollHeight)break;while(C=C.parentNode)}C&&(i=C,o=C.getBoundingClientRect(),r=(F(o.right-d)<=s)-(F(o.left-d)<=s),a=(F(o.bottom-c)<=s)-(F(o.top-c)<=s)),r||a||(r=(s>=u-d)-(s>=d),a=(s>=h-c)-(s>=c),(r||a)&&(i=L)),(R.vx!==r||R.vy!==a||R.el!==i)&&(R.el=i,R.vx=r,R.vy=a,clearInterval(R.pid),i&&(R.pid=setInterval(function(){i===L?L.scrollTo(L.pageXOffset+r*l,L.pageYOffset+a*l):(a&&(i.scrollTop+=a*l),r&&(i.scrollLeft+=r*l))},24)))}},30),z=function(t){var e=t.group;e&&"object"==typeof e||(e=t.group={name:e}),["pull","put"].forEach(function(t){t in e||(e[t]=!0)}),t.groups=" "+e.name+(e.put.join?" "+e.put.join(" "):"")+" "};return t.prototype={constructor:t,_onTapStart:function(t){var e=this,i=this.el,o=this.options,r=t.type,a=t.touches&&t.touches[0],s=(a||t).target,l=s,c=o.filter;if(!("mousedown"===r&&0!==t.button||o.disabled)&&(s=n(s,o.draggable,i))){if(k=g(s,o.draggable),"function"==typeof c){if(c.call(this,t,s,this))return d(e,l,"filter",s,i,k),void t.preventDefault()}else if(c&&(c=c.split(",").some(function(t){return t=n(l,t.trim(),i),t?(d(e,t,"filter",s,i,k),!0):void 0})))return void t.preventDefault();(!o.handle||n(l,o.handle,i))&&this._prepareDragStart(t,a,s)}},_prepareDragStart:function(t,e,n){var i,r=this,s=r.el,d=r.options,c=s.ownerDocument;n&&!_&&n.parentNode===s&&(Y=t,S=s,_=n,D=_.parentNode,T=_.nextSibling,X=d.group,i=function(){r._disableDelayedDrag(),_.draggable=!0,a(_,r.options.chosenClass,!0),r._triggerDragStart(e)},d.ignore.split(",").forEach(function(t){l(_,t.trim(),u)}),o(c,"mouseup",r._onDrop),o(c,"touchend",r._onDrop),o(c,"touchcancel",r._onDrop),d.delay?(o(c,"mouseup",r._disableDelayedDrag),o(c,"touchend",r._disableDelayedDrag),o(c,"touchcancel",r._disableDelayedDrag),o(c,"mousemove",r._disableDelayedDrag),o(c,"touchmove",r._disableDelayedDrag),r._dragStartTimer=setTimeout(i,d.delay)):i())},_disableDelayedDrag:function(){var t=this.el.ownerDocument;clearTimeout(this._dragStartTimer),r(t,"mouseup",this._disableDelayedDrag),r(t,"touchend",this._disableDelayedDrag),r(t,"touchcancel",this._disableDelayedDrag),r(t,"mousemove",this._disableDelayedDrag),r(t,"touchmove",this._disableDelayedDrag)},_triggerDragStart:function(t){t?(Y={target:_,clientX:t.clientX,clientY:t.clientY},this._onDragStart(Y,"touch")):this.nativeDraggable?(o(_,"dragend",this),o(S,"dragstart",this._onDragStart)):this._onDragStart(Y,!0);try{U.selection?U.selection.empty():window.getSelection().removeAllRanges()}catch(e){}},_dragStarted:function(){S&&_&&(a(_,this.options.ghostClass,!0),t.active=this,d(this,S,"start",_,S,k))},_emulateDragOver:function(){if(A){if(this._lastX===A.clientX&&this._lastY===A.clientY)return;this._lastX=A.clientX,this._lastY=A.clientY,W||s(y,"display","none");var t=U.elementFromPoint(A.clientX,A.clientY),e=t,n=" "+this.options.group.name,i=q.length;if(e)do{if(e[j]&&e[j].options.groups.indexOf(n)>-1){for(;i--;)q[i]({clientX:A.clientX,clientY:A.clientY,target:t,rootEl:e});break}t=e}while(e=e.parentNode);W||s(y,"display","")}},_onTouchMove:function(e){if(Y){t.active||this._dragStarted(),this._appendGhost();var n=e.touches?e.touches[0]:e,i=n.clientX-Y.clientX,o=n.clientY-Y.clientY,r=e.touches?"translate3d("+i+"px,"+o+"px,0)":"translate("+i+"px,"+o+"px)";I=!0,A=n,s(y,"webkitTransform",r),s(y,"mozTransform",r),s(y,"msTransform",r),s(y,"transform",r),e.preventDefault()}},_appendGhost:function(){if(!y){var t,e=_.getBoundingClientRect(),n=s(_),i=this.options;y=_.cloneNode(!0),a(y,i.ghostClass,!1),a(y,i.fallbackClass,!0),s(y,"top",e.top-H(n.marginTop,10)),s(y,"left",e.left-H(n.marginLeft,10)),s(y,"width",e.width),s(y,"height",e.height),s(y,"opacity","0.8"),s(y,"position","fixed"),s(y,"zIndex","100000"),s(y,"pointerEvents","none"),i.fallbackOnBody&&U.body.appendChild(y)||S.appendChild(y),t=y.getBoundingClientRect(),s(y,"width",2*e.width-t.width),s(y,"height",2*e.height-t.height)}},_onDragStart:function(t,e){var n=t.dataTransfer,i=this.options;this._offUpEvents(),"clone"==X.pull&&(w=_.cloneNode(!0),s(w,"display","none"),S.insertBefore(w,_)),e?("touch"===e?(o(U,"touchmove",this._onTouchMove),o(U,"touchend",this._onDrop),o(U,"touchcancel",this._onDrop)):(o(U,"mousemove",this._onTouchMove),o(U,"mouseup",this._onDrop)),this._loopId=setInterval(this._emulateDragOver,50)):(n&&(n.effectAllowed="move",i.setData&&i.setData.call(this,n,_)),o(U,"drop",this),setTimeout(this._dragStarted,0))},_onDragOver:function(t){var i,o,r,a=this.el,l=this.options,d=l.group,u=d.put,p=X===d,g=l.sort;if(void 0!==t.preventDefault&&(t.preventDefault(),!l.dragoverBubble&&t.stopPropagation()),I=!0,X&&!l.disabled&&(p?g||(r=!S.contains(_)):X.pull&&u&&(X.name===d.name||u.indexOf&&~u.indexOf(X.name)))&&(void 0===t.rootEl||t.rootEl===this.el)){if(V(t,l,this.el),K)return;if(i=n(t.target,l.draggable,a),o=_.getBoundingClientRect(),r)return e(!0),void(w||T?S.insertBefore(_,w||T):g||S.appendChild(_));if(0===a.children.length||a.children[0]===y||a===t.target&&(i=f(a,t))){if(i){if(i.animated)return;m=i.getBoundingClientRect()}e(p),c(S,a,_,o,i,m)!==!1&&(_.contains(a)||(a.appendChild(_),D=a),this._animate(o,_),i&&this._animate(m,i))}else if(i&&!i.animated&&i!==_&&void 0!==i.parentNode[j]){x!==i&&(x=i,N=s(i),B=s(i.parentNode));var v,m=i.getBoundingClientRect(),b=m.right-m.left,C=m.bottom-m.top,E=/left|right|inline/.test(N.cssFloat+N.display)||"flex"==B.display&&0===B["flex-direction"].indexOf("row"),k=i.offsetWidth>_.offsetWidth,O=i.offsetHeight>_.offsetHeight,Y=(E?(t.clientX-m.left)/b:(t.clientY-m.top)/C)>.5,A=i.nextElementSibling,R=c(S,a,_,o,i,m);if(R!==!1){if(K=!0,setTimeout(h,30),e(p),1===R||-1===R)v=1===R;else if(E){var M=_.offsetTop,L=i.offsetTop;v=M===L?i.previousElementSibling===_&&!k||Y&&k:L>M}else v=A!==_&&!O||Y&&O;_.contains(a)||(v&&!A?a.appendChild(_):i.parentNode.insertBefore(_,v?A:i)),D=_.parentNode,this._animate(o,_),this._animate(m,i)}}}},_animate:function(t,e){var n=this.options.animation;if(n){var i=e.getBoundingClientRect();s(e,"transition","none"),s(e,"transform","translate3d("+(t.left-i.left)+"px,"+(t.top-i.top)+"px,0)"),e.offsetWidth,s(e,"transition","all "+n+"ms"),s(e,"transform","translate3d(0,0,0)"),clearTimeout(e.animated),e.animated=setTimeout(function(){s(e,"transition",""),s(e,"transform",""),e.animated=!1},n)}},_offUpEvents:function(){var t=this.el.ownerDocument;r(U,"touchmove",this._onTouchMove),r(t,"mouseup",this._onDrop),r(t,"touchend",this._onDrop),r(t,"touchcancel",this._onDrop)},_onDrop:function(e){var n=this.el,i=this.options;clearInterval(this._loopId),clearInterval(R.pid),clearTimeout(this._dragStartTimer),r(U,"mousemove",this._onTouchMove),this.nativeDraggable&&(r(U,"drop",this),r(n,"dragstart",this._onDragStart)),this._offUpEvents(),e&&(I&&(e.preventDefault(),!i.dropBubble&&e.stopPropagation()),y&&y.parentNode.removeChild(y),_&&(this.nativeDraggable&&r(_,"dragend",this),u(_),a(_,this.options.ghostClass,!1),a(_,this.options.chosenClass,!1),S!==D?(O=g(_,i.draggable),O>=0&&(d(null,D,"sort",_,S,k,O),d(this,S,"sort",_,S,k,O),d(null,D,"add",_,S,k,O),d(this,S,"remove",_,S,k,O))):(w&&w.parentNode.removeChild(w),_.nextSibling!==T&&(O=g(_,i.draggable),O>=0&&(d(this,S,"update",_,S,k,O),d(this,S,"sort",_,S,k,O)))),t.active&&((null===O||-1===O)&&(O=k),d(this,S,"end",_,S,k,O),this.save()))),this._nulling()},_nulling:function(){S=_=D=y=T=w=C=E=Y=A=I=O=x=N=X=t.active=null},handleEvent:function(t){var e=t.type;"dragover"===e||"dragenter"===e?_&&(this._onDragOver(t),i(t)):("drop"===e||"dragend"===e)&&this._onDrop(t)},toArray:function(){for(var t,e=[],i=this.el.children,o=0,r=i.length,a=this.options;r>o;o++)t=i[o],n(t,a.draggable,this.el)&&e.push(t.getAttribute(a.dataIdAttr)||p(t));return e},sort:function(t){var e={},i=this.el;this.toArray().forEach(function(t,o){var r=i.children[o];n(r,this.options.draggable,i)&&(e[t]=r)},this),t.forEach(function(t){e[t]&&(i.removeChild(e[t]),i.appendChild(e[t]))})},save:function(){var t=this.options.store;t&&t.set(this)},closest:function(t,e){return n(t,e||this.options.draggable,this.el)},option:function(t,e){var n=this.options;return void 0===e?n[t]:(n[t]=e,void("group"===t&&z(n)))},destroy:function(){var t=this.el;t[j]=null,r(t,"mousedown",this._onTapStart),r(t,"touchstart",this._onTapStart),this.nativeDraggable&&(r(t,"dragover",this),r(t,"dragenter",this)),Array.prototype.forEach.call(t.querySelectorAll("[draggable]"),function(t){t.removeAttribute("draggable")}),q.splice(q.indexOf(this._onDragOver),1),this._onDrop(),this.el=t=null}},t.utils={on:o,off:r,css:s,find:l,is:function(t,e){return!!n(t,e,t)},extend:b,throttle:m,closest:n,toggleClass:a,index:g},t.create=function(e,n){return new t(e,n)},t.version="1.4.2",t}),function(t){"use strict";"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)}(function(t){"use strict";t.fn.kvsortable=function(e){var n,i=arguments;return this.each(function(){var o=t(this),r=o.data("kvsortable");if(r||!(e instanceof Object)&&e||(r=new KvSortable(this,e),o.data("kvsortable",r)),r){if("widget"===e)return r;"destroy"===e?(r.destroy(),o.removeData("kvsortable")):"function"==typeof r[e]?n=r[e].apply(r,[].slice.call(i,1)):e in r.options&&(n=r.option.apply(r,i))}}),void 0===n?this:n}});
 \ No newline at end of file
@@ -32,6 +32,8 @@
 <link href="/metronic_v4.5.4/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
 <!-- layer 弹层 插件 -->
 <link href="/assets/plugins/layer-v2.4/layer/skin/layer.css" rel="stylesheet" type="text/css" />
+<!-- fileinput 上传 插件 -->
+<link href="/assets/plugins/fileinput/css/fileinput.min.css" rel="stylesheet" type="text/css" />
 <!-- iCheck 单选框和复选框 -->
 <link href="/metronic_v4.5.4/plugins/icheck/skins/all.css" rel="stylesheet" type="text/css" />
 <!-- 日期控件 -->
@@ -290,6 +292,12 @@ tr.row-active td {
 <script src="/assets/plugins/jquery.pjax.js"></script>
 <!-- layer 弹层 -->
 <script src="/assets/plugins/layer-v2.4/layer/layer.js" data-exclude=1></script>
+<!-- fileinput 上传 -->
+<script src="/assets/plugins/fileinput/canvas-to-blob.min.js"></script>
+<script src="/assets/plugins/fileinput/purify.min.js"></script>
+<script src="/assets/plugins/fileinput/sortable.min.js"></script>
+<script src="/assets/plugins/fileinput/fileinput.min.js"></script>
+<script src="/assets/plugins/fileinput/fileinput_locale_zh.js"></script>
 <!-- jquery.purl URL解析 -->
 <script src="/assets/plugins/purl.js"></script>
 <!-- jquery.serializejson JSON序列化插件 -->
+<div class="page-head">
+	<div class="page-title">
+		<h1>车载设备接入查询</h1>
+	</div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>主页</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">车载设备接入查询</span> <i class="fa fa-circle"></i></li>
+	<li><span class="active">车载设备接入查询</span></li>
+</ul>
+
+<ul id="myTab" class="nav nav-tabs">
+    <li class="active">
+    	<a href="#tab1" data-toggle="tab">单车信息</a>
+    </li>
+    <li>
+    	<a href="#tab2" data-toggle="tab">清册查询</a>
+    </li>
+</ul>
+<div id="myTabContent" class="tab-content">
+    <div class="tab-pane fade in active" id="tab1">
+        <div class="row">
+			<div class="col-md-12">
+				<!-- Begin: life time stats -->
+				<div class="portlet light portlet-fit portlet-datatable bordered">
+					<div class="portlet-body">
+						<div class="table-container" style="margin-top: 10px">
+							<table
+								class="table table-striped table-bordered table-hover table-checkable"
+								id="datatable_devicegps">
+								<thead>
+									<tr role="row" class="heading">
+										<th width="5%">#</th>
+										<th width="15%">识别码</th>
+										<th width="15%">线路ID</th>
+										<th width="10%">GPS</th>
+										<th width="20%">report</th>
+										<th width="15%">版本</th>
+										<th width="20%">操作</th>
+									</tr>
+									<tr role="row" class="filter">
+										<td></td>
+										<td>
+											<input type="text" class="form-control form-filter input-sm" name="deviceId" id="deviceId">
+										</td>
+										<td>
+											<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+										</td>
+										<td>
+										</td>
+										<td></td>
+										<td></td>
+										<td>
+											<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
+		                                                                <i class="fa fa-search"></i> 搜索</button>
+		                                                                
+											<button class="btn btn-sm red btn-outline filter-cancel">
+		                                                            <i class="fa fa-times"></i> 重置</button>
+										</td>
+									</tr>
+								</thead>
+								<tbody></tbody>
+							</table>
+							<div style="text-align: right;">
+								<ul id="pagination" class="pagination"></ul>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+    </div>
+    <div class="tab-pane fade" id="tab2">
+        <div class="row">
+			<div class="col-md-12">
+				<!-- Begin: life time stats -->
+				<div class="portlet light portlet-fit portlet-datatable bordered">
+					<div class="portlet-body">
+						<div class="row">
+							<div class="col-md-6">
+								<input id="fileinput" name="_txt_" type="file" class="file form-control">
+							</div>
+							<div class="col-md-6">
+								<div class="row">
+									<div class="col-md-12">
+										<label class="checkbox-inline">
+											<input type="radio" name="filterOption" value="1" checked>全部
+											&nbsp;
+											<input type="radio" name="filterOption" value="2">GPS无效
+											&nbsp;
+											<input type="radio" name="filterOption" value="3">已接入
+											&nbsp;
+											<input type="radio" name="filterOption" value="4">未接入
+										</label>
+									</div>
+									<div class="col-md-12">
+										<label class="checkbox-inline">
+											<input type="radio" name="filterOption" value="5">版本不等于
+											<input type="text" id="version" name="version" size="5">
+										</label>
+									</div>
+								</div>
+							</div>
+						</div>
+						<div class="table-container" style="margin-top: 10px">
+							<table
+								class="table table-striped table-bordered table-hover table-checkable"
+								id="datatable_devicegps1">
+								<thead>
+									<tr role="row" class="heading">
+										<th width="5%">#</th>
+										<th width="10%">线路编码</th>
+										<th width="10%">线路名称</th>
+										<th width="10%">内部编码</th>
+										<th width="10%">识别号</th>
+										<th width="10%">线路</th>
+										<th width="10%">GPS</th>
+										<th width="15%">report</th>
+										<th width="10%">版本</th>
+									</tr>
+								</thead>
+								<tbody></tbody>
+							</table>
+							<div style="text-align: right;">
+								<ul id="pagination" class="pagination"></ul>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+    </div>
+</div>
+<script id="devicegps_list_temp" type="text/html">
+{{each list as obj i}}
+<tr>
+	<td style="vertical-align: middle;">
+		{{i + 1}}
+	</td>
+	<td>
+		{{obj.deviceId}}
+	</td>
+	<td>
+		{{obj.lineId}}
+	</td>
+	<td>
+		{{if obj.valid==0}}
+			有效
+		{{else if obj.valid==1}}
+			无效
+		{{else}}
+			无效
+		{{/if}}
+	</td>
+	<td class="dt">
+		{{obj.timestamp}}
+	</td>
+	<td>
+		{{obj.version}}
+	</td>
+	<td>
+		
+	</td>
+</tr>
+{{/each}}
+{{if list.length == 0}}
+<tr>
+	<td colspan=7><h6 class="muted">没有找到相关数据</h6></td>
+</tr>
+{{/if}}
+</script>
+<script id="devicegps_list_temp1" type="text/html">
+{{each list as obj i}}
+<tr>
+	<td style="vertical-align: middle;">
+		{{i + 1}}
+	</td>
+	<td>
+		{{obj.lineCode}}
+	</td>
+	<td>
+		{{obj.lineName}}
+	</td>
+	<td>
+		{{obj.inCode}}
+	</td>
+	<td>
+		{{obj.deviceId}}
+	</td>
+	{{if obj.detail==null}}
+	<td>
+	</td>
+	<td>
+	</td>
+	<td>
+	</td>
+	<td>
+	</td>
+	{{else}}
+	<td>
+		{{obj.detail.lineId}}
+	</td>
+	<td>
+		{{if obj.detail.valid==0}}
+			有效
+		{{else if obj.detail.valid==1}}
+			无效
+		{{else}}
+			无效
+		{{/if}}
+	</td>
+	<td class="dt1">
+		{{obj.detail.timestamp}}
+	</td>
+	<td>
+		{{obj.detail.version}}
+	</td>
+	{{/if}}
+</tr>
+{{/each}}
+{{if list.length == 0}}
+<tr>
+	<td colspan=9><h6 class="muted">没有找到相关数据</h6></td>
+</tr>
+{{/if}}
+</script>
+<script>
+$(function(){
+	var opened;
+	$('#myTab li:eq(0) a').tab('show');
+    $('#fileinput').fileinput({
+    	'showPreview' : false,
+    	'showRemove' : false,
+    	'showUpload' : false,
+    	'showCancel' : false,
+    	'previewFileType' : 'any',
+    	'language' : 'zh',
+    	'uploadUrl' : '/devicegps/open'
+    }).on('fileuploaded', function(e,data){
+		var r = data.response;
+		if(r.errCode) layer.msg(r.msg);
+		else {
+			var bodyHtm = template('devicegps_list_temp1', {list: r.data});
+			$('#datatable_devicegps1 tbody').html(bodyHtm);
+			$('.dt1').each(function(){
+				$(this).html(moment(parseInt($(this).html())).format('YYYY-M-D HH:mm:ss'));
+			});
+			opened = new Array();
+			for (var j = 0,len = r.data.length;j < len;j++) {
+				var item = r.data[j];
+				delete item.detail;
+				opened.push(item);
+			}
+		}
+    	$(this).fileinput('clear').fileinput('enable');
+	}).on('change', function(e){
+		$(this).fileinput('upload');
+	});
+    
+    $('#open').on('click', function(e){
+    	$('#fileinput').fileinput('upload');
+    });
+    
+	$('input[type=radio][name=filterOption]').change(function() {
+		importDeviceSearch();
+	});
+
+	function importDeviceSearch(){
+		if (!opened) return false;
+		var params = { json : JSON.stringify(opened) };
+		$post('/devicegps/open/filter', params, function(r){
+			debugger;
+			if(r.errCode) layer.msg(r.msg);
+			else {
+				var filtered = new Array(), val = $('input[type=radio][name=filterOption]:checked').val(), version = $('#version').val(), i = 0,item = null;
+				switch(val) {
+					case '1':
+						filtered = r.data;
+						break;
+					case '2':
+						for (len = r.data.length;i < len;i++) {
+							item = r.data[i];
+							if (item.detail && item.detail.valid) filtered.push(item);
+						}
+						break;
+					case '3':
+						for (len = r.data.length;i < len;i++) {
+							item = r.data[i];
+							if (item.detail) filtered.push(item);
+						}
+						break;
+					case '4':
+						for (len = r.data.length;i < len;i++) {
+							item = r.data[i];
+							if (!item.detail) filtered.push(item);
+						}
+						break;
+					case '5':
+						for (len = r.data.length;i < len;i++) {
+							item = r.data[i];
+							if (item.detail && item.detail.version != version) filtered.push(item);
+						}
+						break;
+					default:
+						break;
+				}
+				var bodyHtm = template('devicegps_list_temp1', {list: filtered});
+				$('#datatable_devicegps1 tbody').html(bodyHtm);
+				$('.dt1').each(function(){
+					$(this).html(moment(parseInt($(this).html())).format('YYYY-M-D HH:mm:ss'));
+				});
+			}
+		});
+	}
+    
+	var page = 0, initPagination;
+	var icheckOptions = {
+	    checkboxClass: 'icheckbox_flat-blue',
+	    increaseArea: '20%'
+	}
+	
+	//jsDoQuery(null,true);
+	
+	//重置
+	$('tr.filter .filter-cancel').on('click', function(){
+		$('tr.filter input, select').val('').change();
+		jsDoQuery(null, true);
+	});
+	
+	//提交
+	$('tr.filter .filter-submit').on('click', function(){
+		var cells = $('tr.filter')[0].cells
+			,params = {}
+			,name;
+		$.each(cells, function(i, cell){
+			var items = $('input,select', cell);
+			for(var j = 0, item; item = items[j++];){
+				name = $(item).attr('name');
+				if(name){
+					params[name] = $(item).val();
+				}
+			}
+		});
+		page = 0;
+		jsDoQuery(params, true);
+	});
+	
+	/*
+	* 获取数据 p: 要提交的参数， pagination: 是否重新分页
+	*/
+	function jsDoQuery(p, pagination){
+		var params = {};
+		if(p)
+			params = p;
+		//更新时间排序
+		//params['order'] = 'lastLoginDate';
+		//params['page'] = page;
+		var i = layer.load(2), url = '/devicegps/real/all';
+		if(params['line']) url = '/devicegps/real/line/' + params['line'];
+		
+		$get(url, params, function(data){
+			var json = new Array(), deviceId = params['deviceId'];
+			if (deviceId) {
+				for (var j = 0,len = data.length;j < len;j++) {
+					var item = data[j];
+					if(item.deviceId && item.deviceId.indexOf(deviceId) > -1)
+						json.push(data[j]);
+				}
+			} else {
+				json = data;
+			}
+			var bodyHtm = template('devicegps_list_temp', {list: json});
+			$('#datatable_devicegps tbody').html(bodyHtm);
+			$('.dt').each(function(){
+				$(this).html(moment(parseInt($(this).html())).format('YYYY-M-D HH:mm:ss'));
+			});
+			layer.close(i);
+		});
+	}
+	
+	//搜索线路
+	$('#line').select2({
+		ajax: {
+			url: '/realSchedule/findLine',
+			type: 'post',
+			dataType: 'json',
+			delay: 150,
+			data: function(params){
+				return{line: params.term};
+			},
+		    processResults: function (data) {
+		      return {
+		        results: data
+		      };
+		    },
+			cache: true
+		},
+		templateResult: function(repo){
+			if (repo.loading) return repo.text;
+			var h = '<span>'+repo.text+'</span>';
+			return h;
+		},
+		escapeMarkup: function (markup) { return markup; },
+		minimumInputLength: 1,
+		templateSelection: function(repo){
+			return repo.text;
+		},
+		language: {
+	       noResults: function(){
+	           return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
+	       },
+	       inputTooShort : function(e) {
+				return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
+		   },
+	       searching : function() {
+				return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
+		   }
+		}
+	});
+});
+</script>
 \ No newline at end of file
@@ -74,18 +74,18 @@
                 <div class="form-group has-success has-feedback" ng-if="ctrl.type == 1">
                     <label class="col-md-2 control-label">车辆配置-修改后*：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.groupInfo"
-                                    name="cl_after"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.groupInfo.clId}}"
+                        <sa-Select5 name="cl_after"
+                                    model="ctrl.groupInfo"
+                                    cmaps="{'clId' : 'id', 'clZbh': 'insideCode'}"
                                     dcname="clId"
                                     icname="id"
-                                    dcname2="clZbh"
-                                    icname2="insideCode"
-                                    icnames="insideCode"
-                                    datatype="cci3"
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'cci3' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.insideCode"
+                                    searchph="请输拼音..."
+                                    searchexp="this.insideCode"
                                     required >
-                        </sa-Select3>
+                        </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.cl_after.$error.required">
@@ -121,21 +121,18 @@
                 <div class="form-group has-success has-feedback" ng-if="ctrl.type == 3">
                     <label class="col-md-2 control-label">驾驶员-修改后*：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.groupInfo"
-                                    name="jsy"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.groupInfo.jsy1Id}}"
+                        <sa-Select5 name="jsy"
+                                    model="ctrl.groupInfo"
+                                    cmaps="{'jsy1Id' : 'id', 'jsy1Gh': 'jobCode', 'jsy1Name': 'personnelName'}"
                                     dcname="jsy1Id"
-                                    icname="jsyId"
-                                    dcname2="jsy1Gh"
-                                    icname2="jsyGh"
-                                    dcname3="jsy1Name"
-                                    icname3="jsyName"
-                                    icnames="jsyName"
-                                    datatype="eci"
-                                    mlp="true"
+                                    icname="id"
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'ry' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
+                                    searchph="请输拼音..."
+                                    searchexp="this.personnelName + '（' + this.jobCode + '）'"
                                     required >
-                        </sa-Select3>
+                        </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
@@ -145,26 +142,24 @@
                 <div class="form-group" ng-if="ctrl.type == 3">
                     <label class="col-md-2 control-label">售票员-修改前：</label>
                     <div class="col-md-3">
-                        <input type="text" class="form-control" name="jsy_before" ng-value="ctrl.groupInfo_src.spy1Name + '（' + ctrl.groupInfo_src.spy1Gh + '）'" readonly/>
+                        <input type="text" class="form-control" name="spy_before" ng-value="ctrl.groupInfo_src.spy1Id == null ? '' : (ctrl.groupInfo_src.spy1Name + '（' + ctrl.groupInfo_src.spy1Gh + '）')" readonly/>
                     </div>
                 </div>
                 <div class="form-group" ng-if="ctrl.type == 3">
                     <label class="col-md-2 control-label">售票员-修改后：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.groupInfo"
-                                    name="spy"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.groupInfo.spy1Id}}"
+                        <sa-Select5 name="spy"
+                                    model="ctrl.groupInfo"
+                                    cmaps="{'spy1Id' : 'id', 'spy1Gh': 'jobCode', 'spy1Name': 'personnelName'}"
                                     dcname="spy1Id"
-                                    icname="spyId"
-                                    dcname2="spy1Gh"
-                                    icname2="spyGh"
-                                    dcname3="spy1Name"
-                                    icname3="spyName"
-                                    icnames="spyName"
-                                    datatype="eci2"
-                                    mlp="true">
-                        </sa-Select3>
+                                    icname="id"
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'ry' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
+                                    searchph="请输拼音..."
+                                    searchexp="this.personnelName + '（' + this.jobCode + '）'"
+                                    >
+                        </sa-Select5>
                     </div>
                 </div>
@@ -196,21 +191,18 @@
                 <div class="form-group has-success has-feedback" ng-if="ctrl.type == 5">
                     <label class="col-md-2 control-label">驾驶员-修改后*：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.groupInfo"
-                                    name="jsy"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.groupInfo.jsy2Id}}"
+                        <sa-Select5 name="jsy"
+                                    model="ctrl.groupInfo"
+                                    cmaps="{'jsy2Id' : 'id', 'jsy2Gh': 'jobCode', 'jsy2Name': 'personnelName'}"
                                     dcname="jsy2Id"
-                                    icname="jsyId"
-                                    dcname2="jsy2Gh"
-                                    icname2="jsyGh"
-                                    dcname3="jsy2Name"
-                                    icname3="jsyName"
-                                    icnames="jsyName"
-                                    datatype="eci"
-                                    mlp="true"
+                                    icname="id"
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'ry' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
+                                    searchph="请输拼音..."
+                                    searchexp="this.personnelName + '（' + this.jobCode + '）'"
                                     required >
-                        </sa-Select3>
+                        </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
@@ -220,26 +212,24 @@
                 <div class="form-group" ng-if="ctrl.type == 5">
                     <label class="col-md-2 control-label">售票员-修改前：</label>
                     <div class="col-md-3">
-                        <input type="text" class="form-control" name="jsy_before" ng-value="ctrl.groupInfo_src.spy2Name + '（' + ctrl.groupInfo_src.spy2Gh + '）'" readonly/>
+                        <input type="text" class="form-control" name="jsy_before" ng-value="ctrl.groupInfo_src.spy2Id == null ? '' : (ctrl.groupInfo_src.spy2Name + '（' + ctrl.groupInfo_src.spy2Gh + '）')" readonly/>
                     </div>
                 </div>
                 <div class="form-group" ng-if="ctrl.type == 5">
                     <label class="col-md-2 control-label">售票员-修改后：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.groupInfo"
-                                    name="spy"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.groupInfo.spy2Id}}"
+                        <sa-Select5 name="spy"
+                                    model="ctrl.groupInfo"
+                                    cmaps="{'spy2Id' : 'id', 'spy2Gh': 'jobCode', 'spy2Name': 'personnelName'}"
                                     dcname="spy2Id"
-                                    icname="spyId"
-                                    dcname2="spy2Gh"
-                                    icname2="spyGh"
-                                    dcname3="spy2Name"
-                                    icname3="spyName"
-                                    icnames="spyName"
-                                    datatype="eci2"
-                                    mlp="true">
-                        </sa-Select3>
+                                    icname="id"
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'ry' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
+                                    searchph="请输拼音..."
+                                    searchexp="this.personnelName + '（' + this.jobCode + '）'"
+                                >
+                        </sa-Select5>
                     </div>
                 </div>
@@ -252,7 +242,8 @@
                 <div class="row">
                     <div class="col-md-offset-3 col-md-4">
                         <button type="submit" class="btn green"
-                                ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
+                                ng-disabled="!myForm.$valid"
+                                ><i class="fa fa-check"></i> 提交</button>
                         <a type="button" class="btn default" ui-sref="schedulePlanReportManage" ><i class="fa fa-times"></i> 取消</a>
                     </div>
                 </div>
@@ -5,10 +5,10 @@
             <thead>
             <tr role="row" class="heading">
                 <th style="width: 50px;">序号</th>
-                <th style="width: 230px;">线路</th>
+                <th style="width: 180px;">线路</th>
                 <th style="width: 180px">日期</th>
-                <th style="width: 60px">路牌</th>
-                <th style="width: 100px;">车辆</th>
+                <th style="width: 50px">路牌</th>
+                <th style="width: 130px;">车辆</th>
                 <th style="width: 80px;">出场1</th>
                 <th style="width: 100px;">驾工1</th>
                 <th style="width: 100px;">驾1</th>
@@ -215,7 +215,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;SchedulePlanReportManageFormCtrl&#39;, [
     'SchedulePlanReportManageService',
     '$stateParams',
     '$state',
-    function(schedulePlanReportManageService, $stateParams, $state) {
+    '$scope',
+    function(schedulePlanReportManageService, $stateParams, $state, $scope) {
         var self = this;
         // 传过来的值
@@ -238,14 +239,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;SchedulePlanReportManageFormCtrl&#39;, [
                 src: self.groupInfo_src,
                 update: self.groupInfo
             };
+
+            //console.log($scope);
+            //console.log(param);
             schedulePlanReportManageService.updateDetail(param).then(
                 function(result) {
-                    if (result.status == 'SUCCESS') {
-                        alert("保存成功！");
-                        $state.go("schedulePlanReportManage");
-                    } else {
-                        alert("保存异常！");
-                    }
+                    $state.go("schedulePlanReportManage");
                 },
                 function(result) {
                     alert("出错啦！");
@@ -190,6 +190,10 @@
     font-weight: 600;
 }
+.schedule-body .ct_table dl._search_hide{
+  display: none !important;
+}
+
 .context-menu-list.schedule-ct-menu {
     /*font-size: 13px;*/
     font-family: 微软雅黑;
@@ -333,6 +337,12 @@ dd.tl-zzzx {
     width: 100%;
 }
+.ct-form-modal span.uk-form-help-inline,
+.ct-form-modal p.uk-form-help-block{
+  color: #888888;
+  font-size: 13px;
+}
+
 /** 批量待发调整 */
@@ -706,3 +716,47 @@ input.i-cbox[type=checkbox]{
 .sch-tzrc-table.ct_table>.ct_table_body dl.context-menu-active{
   background: #e6e6e6;
 }
+
+.search_sch_panel{
+    float: right;
+}
+
+.search_sch_panel .uk-form input[type=text]{
+  width: 80px;
+  background: #fafafa;
+  border: 0;
+  border-bottom: 1px solid #ddd;
+  font-size: 14px;
+  height: 20px;
+  transition: all .3s ease;
+}
+
+.search_sch_panel .uk-form div.uk-form-icon.active input[type=text]{
+  width: 145px;
+}
+
+.search_sch_panel .uk-form div.uk-form-icon i.cancel{
+    position: absolute;
+    right: 8px;
+    font-size: 13px;
+    color: #c3b9ba;
+    cursor: pointer;
+    display: none;
+    padding: 0;
+    pointer-events: auto;
+    width: 18px;
+    text-indent: 0;
+}
+
+/*.search_sch_panel .uk-form div.uk-form-icon i.cancel:before{*/
+
+/*}*/
+
+.search_sch_panel .uk-form div.uk-form-icon.active i.cancel{
+    display: block;
+}
+
+.search_sch_panel .uk-form input[type=text]::-webkit-input-placeholder{
+  font-size: 12px;
+  color: #cecece;
+}
+.uk-autocomplete.sch-search-autocom .uk-dropdown {
+    width: 260px;
+    max-height: 500px;
+    overflow: auto;
+}
+
+.sch-search-results>li {
+    position: relative;
+    /*line-height: 18px;*/
+}
+
+.sch-search-results>li.uk-active small {
+    color: #ebeaea;
+}
+
+.sch-search-results small {
+    /*display: block;*/
+    /*color: #9b9797;
+    margin-left: 9px;*/
+    color: #009dd8;
+}
+
+.sch-search-results small.search-result-desc {
+    white-space: nowrap;
+    overflow: hidden;
+    display: block;
+    text-overflow: ellipsis;
+    margin-left: 0;
+    color: #9b9797;
+}
+
+
+/*.sch-search-results div.exec_sch_badge {
+    position: absolute;
+    top: 8px;
+    right: 3px;
+    background: #96f396;
+    text-indent: 0;
+    padding: 0 3px;
+    border-radius: 5px;
+    color: #7b5d5d;
+}*/
@@ -7,6 +7,17 @@
         {{else}}
           下行/{{line.endStationName}}
         {{/if}}
+        <div class="search_sch_panel">
+          <form class="uk-form" onsubmit="javascript:return false;">
+              <div class="uk-autocomplete sch-search-autocom">
+                <div class="uk-form-icon">
+                    <i class="uk-icon-search"></i>
+                    <input type="text" placeholder="search">
+                    <i class="cancel uk-icon-times-circle" data-uk-tooltip="{pos:'right'}" title="取消过滤"></i>
+                </div>
+              </div>
+          </form>
+        </div>
       </h3>
       <div class="schedule-body">
           <div class="ct_table_wrap">
@@ -16,9 +16,9 @@
       <div class="uk-width-medium-1-1 sys-note-42" id="{{domId}}">
         <div class="uk-panel uk-panel-box uk-panel-box-secondary">
             <h5 class="title">
-              {{t.fcsjActual}} {{t.clZbh}} 已由 {{t.qdzName}} 发出
+              {{t.fcsjActual}} {{t.clZbh}} 已由 {{t.qdzName}} 发出，执行班次  {{t.dfsj}}
             </h5>
-            <code>{{dataStr}}</code>
+            <code>{{t.fcsjActual}}</code>
             <div class="uk-button-group">
                 <a class="uk-button uk-button-mini uk-button-primary" >确定</a>
             </div>
@@ -36,7 +36,7 @@
             		已完成当日所有班次。
             		{{/if}}
               </h5>
-              <code>{{dataStr}}</code>
+              <code>{{t.zdsjActual}}</code>
               <div class="uk-button-group">
                   <a class="uk-button uk-button-mini uk-button-primary" >确定</a>
               </div>
+<div class="uk-modal ct-form-modal" id="tts-config-modal">
+    <div class="uk-modal-dialog" style="width: 530px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>TTS 语音设置</h2></div>
+
+        <p style="border-bottom: 1px solid #efefef;color: grey;padding-bottom: 9px;">
+          <small>
+            <i class="uk-icon-question-circle"> </i>
+            设置项将会保存在本地客户端，清理缓存和更换电脑会重置.</small>
+        </p>
+        <form class="uk-form uk-form-horizontal">
+            <div class="uk-grid">
+                <div class="uk-width-2-3 uk-container-center">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">启用TTS</label>
+                        <div class="uk-form-controls">
+                            <select name="enable">
+                              <option value="1">启用</option>
+                              <option value="0">禁用</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-grid">
+                <div class="uk-width-2-3 uk-container-center">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">发音速度</label>
+                        <div class="uk-form-controls">
+                            <input name="rate" max=10 data-fv-lessthan-inclusive="false" style="width: calc(100% - 80px);" />
+                            <span class="uk-form-help-inline">1 ~ 10</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="uk-grid">
+                <div class="uk-width-2-3 uk-container-center">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">播放队列</label>
+                        <div class="uk-form-controls">
+                            <select name="queueModel">
+                              <option value="1">总是最新</option>
+                              <option value="-1">按顺序完整播报</option>
+                            </select>
+                            <p class="uk-form-help-block"></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="uk-grid">
+                <div class="uk-width-1-1" style="margin-top: 25px;">
+                  <div class="uk-panel uk-panel-box" style="font-size: 12px;color: grey;">
+                      我能吞下玻璃而不伤身体&nbsp;
+                      <button class="uk-button uk-button-success uk-button-mini" type="button" id="tts-audition-btn">
+                        <i class="uk-icon-volume-down"> </i> 试听</button>
+                  </div>
+                </div>
+            </div>
+
+            <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
+                <button type="button" class="uk-button uk-modal-close">取消</button>
+                <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+            </div>
+        </form>
+    </div>
+
+    <script>
+        (function() {
+            var modal = '#tts-config-modal';
+            var f = $('form', modal);
+
+            $(modal).on('init', function(e, data) {
+              var config=gb_tts.defaultConfig();
+              for(var name in config)
+                $('[name='+name+']', f).val(config[name]).trigger('change');
+
+            });
+
+            $('select[name=queueModel]', f).on('change', function(){
+              var val=$(this).val()
+                ,$help=$(this).next('.uk-form-help-block');
+
+              if(val == 1)
+                $help.text('有新的语音，强制中断未结束的语音');
+              else
+                $help.text('按照队列顺序依次完整播报');
+            });
+
+            $('#tts-audition-btn', f).on('click', function(){
+              var msg='我能吞下玻璃而不伤身体'
+                ,rate=$('[name=rate]',f).val();
+              gb_tts.audition(msg, rate);
+            });
+
+            f.formValidation(gb_form_validation_opts);
+            f.on('success.form.fv', function(e) {
+              e.preventDefault();
+              var data = $(this).serializeJSON();
+              gb_tts.writeConfig(data);
+              UIkit.modal(modal).hide();
+              notify_succ('TTS配置修改成功！');
+            });
+
+        })();
+    </script>
+</div>
@@ -2,11 +2,12 @@
 var gb_data_basic = (function() {
-    var stationRoutes,lineCode2NameAll,lineInformations;
-    var ep = EventProxy.create("stationRoutes", "lineCode2Name", "lineInformations", function(routes, code2Name, informations) {
+    var stationRoutes,lineCode2NameAll,lineInformations, nbbm2deviceMap;
+    var ep = EventProxy.create("stationRoutes", "lineCode2Name", "lineInformations", "nbbm2deviceId", function(routes, code2Name, informations, nbbm2device) {
         stationRoutes = routes;
         lineCode2NameAll = code2Name;
         lineInformations = informations;
+        nbbm2deviceMap = nbbm2device;
         gb_main_ep.emitLater('data-basic');
     });
@@ -46,6 +47,11 @@ var gb_data_basic = (function() {
       ep.emit('lineCode2Name', rs);
     });
+    //nbbm to device id
+    $.get('/basic/nbbm2deviceId', function(rs){
+      ep.emit('nbbm2deviceId', rs);
+    });
+
     function findLineByCodes(codeArr){
       var rs=[];
       $.each(codeArr, function(){
@@ -73,6 +79,7 @@ var gb_data_basic = (function() {
         activeLines: activeLines,
         line_idx: line_idx,
         codeToLine: codeToLine,
+        nbbm2deviceMap: function(){return nbbm2deviceMap;},
         getLineInformation: getLineInformation,
         stationRoutes: function(lineCode){return stationRoutes[lineCode]},
         findLineByCodes: findLineByCodes,
@@ -76,11 +76,16 @@ var gb_data_gps = (function() {
       return realData[deviceId];
     }
+    var findGpsByNbbm = function(nbbm){
+      return realData[gb_data_basic.nbbm2deviceMap()[nbbm]];
+    }
+
     return {
         fixedTimeRefresh: fixedTimeRefresh,
         registerCallback: registerCallback,
         allGps: realData,
         gpsByLineCode: gpsByLineCode,
-        findOne: findOne
+        findOne: findOne,
+        findGpsByNbbm: findGpsByNbbm
     };
 })();
-/* 实际排班数据管理模块 */
-
-var gb_data_sch = (function(){
-
-})();
@@ -12,5 +12,10 @@
     }]
 }, {
     "id": 3,
-    "text": "系统设置"
+    "text": "系统设置",
+    "children": [{
+        "id": 3.1,
+        "text": "TTS",
+        "event": "tts_config"
+    }]
 }]
@@ -5,12 +5,13 @@ var gb_schedule_table = (function() {
     var temps;
     //线路分组的班次数据
     var line2Schedule = {};
-
+    //车辆应发未发车辆数
+    var car_yfwf_map = {};
     var schedule_sort = function(s1, s2) {
         return s1.dfsjT - s2.dfsjT;
     }
-    var show = function() {
+    var show = function(cb) {
         //从服务器获取班次数据
         $.get('/realSchedule/lines', {
             lines: gb_data_basic.line_idx
@@ -63,6 +64,8 @@ var gb_schedule_table = (function() {
             gb_ct_table.enableSort($('.ct_table', content), reset_seq_no, gb_schedule_table_dbclick.init);
             //dbclick event
             gb_schedule_table_dbclick.init();
+
+            cb && cb();
         });
     }
@@ -95,44 +98,44 @@ var gb_schedule_table = (function() {
     }
     //新增一个班次，附带更新的班次
-    var insertSchedule=function(sch, upArr){
-      line2Schedule[sch.xlBm][sch.id]=sch;
-      //update
-      if(isArray(upArr)){
-        $.each(upArr, function(){
-          line2Schedule[this.xlBm][this.id]=this;
-        });
-      }
-
-      //重新渲染表格
-      var data=gb_common.get_vals(line2Schedule[sch.xlBm]).sort(schedule_sort)
-        ,dirData = gb_common.groupBy(data, 'xlDir')
-        ,tabCont=$('li.line_schedule[data-id='+sch.xlBm+']');
-
-      for (var upDown in dirData) {
-          htmlStr = temps['line-schedule-table-temp']({
-              dir: upDown,
-              line: gb_data_basic.codeToLine[sch.xlBm],
-              list: dirData[upDown]
-          });
-          $('.schedule-wrap .card-panel:eq(' + upDown + ')', tabCont).html(htmlStr);
-      }
-      calc_yfwf_num(sch.xlBm);
-      //定位到新添加的班次
-      scroToDl(sch);
+    var insertSchedule = function(sch, upArr) {
+        line2Schedule[sch.xlBm][sch.id] = sch;
+        //update
+        if (isArray(upArr)) {
+            $.each(upArr, function() {
+                line2Schedule[this.xlBm][this.id] = this;
+            });
+        }
+
+        //重新渲染表格
+        var data = gb_common.get_vals(line2Schedule[sch.xlBm]).sort(schedule_sort),
+            dirData = gb_common.groupBy(data, 'xlDir'),
+            tabCont = $('li.line_schedule[data-id=' + sch.xlBm + ']');
+
+        for (var upDown in dirData) {
+            htmlStr = temps['line-schedule-table-temp']({
+                dir: upDown,
+                line: gb_data_basic.codeToLine[sch.xlBm],
+                list: dirData[upDown]
+            });
+            $('.schedule-wrap .card-panel:eq(' + upDown + ')', tabCont).html(htmlStr);
+        }
+        calc_yfwf_num(sch.xlBm);
+        //定位到新添加的班次
+        scroToDl(sch);
     }
     //删除一个班次
-    var deheteSchedule = function(sch){
-      sch = line2Schedule[sch.xlBm][sch.id];
-      if(sch){
-        var dl = $('li.line_schedule[data-id=' + sch.xlBm + '] .ct_table_body dl[data-id=' + sch.id + ']')
-          ,dls=dl.parent().find('dl');
-        delete line2Schedule[sch.xlBm][sch.id];
-        dl.remove();
-        reset_seq_no(dls);
-        calc_yfwf_num(sch.xlBm);
-      }
+    var deheteSchedule = function(sch) {
+        sch = line2Schedule[sch.xlBm][sch.id];
+        if (sch) {
+            var dl = $('li.line_schedule[data-id=' + sch.xlBm + '] .ct_table_body dl[data-id=' + sch.id + ']'),
+                dls = dl.parent().find('dl');
+            delete line2Schedule[sch.xlBm][sch.id];
+            dl.remove();
+            reset_seq_no(dls);
+            calc_yfwf_num(sch.xlBm);
+        }
     }
     //更新班次
@@ -148,7 +151,7 @@ var gb_schedule_table = (function() {
     //update dom
     var updateDom = function(sch) {
-        if(!sch) return;
+        if (!sch) return;
         var dl = $('li.line_schedule[data-id=' + sch.xlBm + '] .ct_table_body dl[data-id=' + sch.id + ']');
         var dds = $('dd', dl);
         $(dds[1]).find('a').text(sch.lpName);
@@ -167,17 +170,17 @@ var gb_schedule_table = (function() {
         calc_sch_real_shift(sch);
         var sfsjDd = temps['line-schedule-sfsj-temp'](sch);
         $(dds[7]).replaceWith(sfsjDd);
-        if(sch.remarks)
-          $(dds[8]).html('<span title="'+sch.remarks+'" data-uk-tooltip="{pos:\'top-left\'}">'+sch.remarks+'</span>');
+        if (sch.remarks)
+            $(dds[8]).html('<span title="' + sch.remarks + '" data-uk-tooltip="{pos:\'top-left\'}">' + sch.remarks + '</span>');
         else
-          $(dds[8]).html('');
+            $(dds[8]).html('');
     }
     //拖拽选中...
     var seq_nos = '.line-schedule-table .ct_table_body>dl>dd.seq_no';
     var drag_strat;
     $(document).on('mousedown', seq_nos, function(e) {
-        if(e.button != 0) return;
+        if (e.button != 0) return;
         var dl = $(this).parent();
         if (dl.hasClass('drag-active'))
             dl.removeClass('drag-active');
@@ -189,15 +192,20 @@ var gb_schedule_table = (function() {
         drag_strat = null;
     }).on('mouseover', seq_nos, function() {
         if (drag_strat) {
-            var drag_end = parseInt($(this).text()),
+            var e = parseInt($(this).text()),
                 dls = $(this).parents('.ct_table_body').find('dl');
             reset_drag_active_all(this);
-            if (drag_end - drag_strat <= 1)
-                return;
-
-            for (var i = drag_strat; i < drag_end; i++)
-                $(dls[i]).addClass('drag-active');
+            //向上选中
+            if (e <= drag_strat) {
+                for (var i = drag_strat; i > e - 2; i--)
+                    $(dls[i]).addClass('drag-active');
+            }
+            //向下选中
+            else {
+                for (var j = drag_strat; j < e; j++)
+                    $(dls[j]).addClass('drag-active');
+            }
         }
     }).on('click', seq_nos, function() {
         reset_relevance_active(this);
@@ -213,22 +221,22 @@ var gb_schedule_table = (function() {
             schArr = gb_common.get_vals(line2Schedule[lineCode]).filter(function(item) {
                 return item.clZbh == sch.clZbh;
             }).sort(schedule_sort),
-            nextSch,tempDL;
+            nextSch, tempDL;
         $.each(schArr, function(i) {
-            tempDL=$('dl[data-id=' + this.id + ']', contWrap);
+            tempDL = $('dl[data-id=' + this.id + ']', contWrap);
             tempDL.addClass('relevance-active');
-            if (i < schArr.length - 1 && this.id == id){
-              nextSch = schArr[i + 1];
-              tempDL.addClass('intimity');
+            if (i < schArr.length - 1 && this.id == id) {
+                nextSch = schArr[i + 1];
+                tempDL.addClass('intimity');
             }
         });
-        if(nextSch){
-          $('dl[data-id=' + nextSch.id + ']', contWrap).addClass('intimity');
-          if (nextSch.xlDir == sch.xlDir)
-              return;
-          //滚动到下一个班次
-          scroToDl(nextSch);
+        if (nextSch) {
+            $('dl[data-id=' + nextSch.id + ']', contWrap).addClass('intimity');
+            if (nextSch.xlDir == sch.xlDir)
+                return;
+            //滚动到下一个班次
+            scroToDl(nextSch);
         }
     });
@@ -275,25 +283,33 @@ var gb_schedule_table = (function() {
         $(dd).parents('.uk-grid.schedule-wrap').find('.relevance-active').removeClass('relevance-active intimity');
     }
-    //计算应发未发数量
-    var calc_yfwf_num = function(lineCode){
-      var schArr=line2Schedule[lineCode]
-        ,yfwf_num=0
-        ,t = new Date().valueOf();
+    //计算应发未发数量 car_yfwf_map
+    var calc_yfwf_num = function(lineCode) {
-      $.each(schArr, function(){
-        if(this.fcsjT > t)
-						return false;
+        var schArr = gb_common.get_vals(line2Schedule[lineCode]).sort(schedule_sort),
+            yfwf_num = 0,
+            t = new Date().valueOf();
-        if(this.fcsjActual == null && this.fcsjActualTime == null && this.status != -1)
-  					yfwf_num ++;
-      });
+        var carYfwfMap={}, nbbm;
+        $.each(schArr, function() {
+            if (this.fcsjT > t)
+                return false;
+
+            if (this.fcsjActual == null && this.fcsjActualTime == null && this.status != -1){
+              yfwf_num++;
+              nbbm=this.clZbh;
+              if(carYfwfMap[nbbm])
+                carYfwfMap[nbbm]++;
+              else
+                carYfwfMap[nbbm]=1;
+            }
+        });
+        car_yfwf_map[lineCode]=carYfwfMap;
-      $('#badge_yfwf_num_'+lineCode).text(yfwf_num);
+        $('#badge_yfwf_num_' + lineCode).text(yfwf_num);
     }
-
     return {
         show: show,
         findScheduleByLine: findScheduleByLine,
@@ -301,6 +317,7 @@ var gb_schedule_table = (function() {
         deheteSchedule: deheteSchedule,
         insertSchedule: insertSchedule,
         schedule_sort: schedule_sort,
-        calc_yfwf_num: calc_yfwf_num
+        calc_yfwf_num: calc_yfwf_num,
+        car_yfwf_map: function(lineCode){return car_yfwf_map[lineCode];}
     };
 })();
+/** 班次搜索 */
+var gb_sch_search = (function() {
+
+    //搜索结果模板，和art-template冲突。 用字符串渲染
+    var result_template = '<script type="text/autocomplete">' +
+        '  <ul class="uk-nav uk-nav-autocomplete uk-autocomplete-results sch-search-results">' +
+        '      {{~items}}' +
+        '      <li data-value="{{ $item.value }}">' +
+        '          <a>' +
+        '              {{ $item.value }}' +
+        '              <small >{{$item.exec}}</small>' +
+        '              <small class="search-result-desc">{{{ $item.desc }}}</small>' +
+        '          </a>' +
+        '      </li>' +
+        '      {{/items}}' +
+        '  </ul>' +
+        '</script>';
+
+    var ips = '.search_sch_panel input',
+        _input, schArr, lineCode, group_cars;
+    $(document)
+        .on('focus', ips, function() {
+            $(this).parent().addClass('active');
+            lineCode = $(this).parents('li.line_schedule').data('id');
+            schArr = gb_common.get_vals(gb_schedule_table.findScheduleByLine(lineCode));
+
+            group_cars = gb_common.groupBy(schArr, 'clZbh');
+            _input = $(this);
+        })
+        .on('blur', ips, function() {
+            if ($(this).val() == ''){
+              reset_all();
+            }
+        });
+
+    $(document).on('click', '.search_sch_panel i.cancel', function(){
+        reset_all();
+    });
+
+    var elements = '.search_sch_panel .sch-search-autocom';
+    var init = function() {
+        $(elements).each(function() {
+            $(this).append(result_template);
+            constructor(this);
+        });
+    };
+
+    var constructor = function(e) {
+        UIkit.autocomplete(e, {
+            minLength: 1,
+            delay: 10,
+            source: autocomplete_source
+        }).on('selectitem.uk.autocomplete', selectitem);
+    }
+
+    var autocomplete_source = function(release) {
+        var rs = [],
+            v = _input.val().toUpperCase(),
+            gps, yfwf_map = gb_schedule_table.car_yfwf_map(lineCode);
+
+        for (var car in group_cars) {
+            if (car.indexOf(v) != -1) {
+                //车辆对应的gps
+                gps = gb_data_gps.findGpsByNbbm(car)
+                rs.push({
+                    value: car,
+                    desc: '应发未发：' + (yfwf_map[car] == null ? 0 : yfwf_map[car]),
+                    exec: execSch(gps)
+                });
+            }
+        }
+
+        release && release(rs);
+    }
+
+    var reset_all = function() {
+        var cont = 'li.line_schedule[data-id=' + lineCode + ']';
+        //uikit 会记住上一次搜索值，触发keyup以清空该值
+        $('.sch-search-autocom input', cont).val('').trigger('keyup').parent().removeClass('active');
+        $('.line-schedule-table .ct_table_body dl._search_hide', cont).removeClass('_search_hide');
+    }
+
+    function execSch(gps) {
+        if (gps && gps.schId) {
+            var sch = gb_schedule_table.findScheduleByLine(gps.lineId)[gps.schId];
+            if (sch)
+                return '（执行' + (sch.xlDir == 0 ? '上行' : '下行') + sch.dfsj + '）';
+        }
+        return '';
+    }
+
+    var selectitem = function(event, data, acobject) {
+        var cont = 'li.line_schedule[data-id=' + lineCode + ']',
+            tbodys = $('.line-schedule-table .ct_table_body', cont);
+
+        $('.sch-search-autocom input', cont).val(data.value).parent().addClass('active');
+
+        $.each(tbodys, function() {
+            filterScheduleByNbbm(this, data.value);
+        });
+    }
+
+    var filterScheduleByNbbm = function(tbody, car) {
+        var dls = $('dl', tbody),
+            dds;
+        dls.removeClass('_search_hide');
+        $.each(dls, function() {
+            dds = $('dd', this);
+            if (car != $(dds[2]).data('nbbm'))
+                $(this).addClass('_search_hide');
+        });
+    }
+
+    return {
+        init: init
+    };
+})();
@@ -35,7 +35,10 @@ var gb_main_ep = new EventProxy(),
         //render schedule table
         eq.once('render-sch-table', function() {
-            gb_schedule_table.show();
+            gb_schedule_table.show(function(){
+              //搜索框
+              gb_sch_search.init();
+            });
             //嵌入地图页面
 			      $('li.map-panel','#main-tab-content').load('/real_control_v2/mapmonitor/real_monitor/real.html');
@@ -46,6 +46,9 @@ var gb_northToolbar = (function() {
     },
     directive_history: function(){
       open_modal('/real_control_v2/fragments/north/nav/directive_history.html', {}, modal_opts);
+    },
+    tts_config: function(){
+      open_modal('/real_control_v2/fragments/north/nav/tts_config.html', {}, modal_opts);
     }
   }
 })();
+var gb_tts = (function() {
+
+    var storage = window.localStorage;
+    var defaultConfig = {
+        //发音速度 1 ~ 10
+        rate: 1.2,
+        //播放队列 1：覆盖式（总是播放最新）  -1：完整的按顺序播报
+        queueModel: 1,
+        enable: 1
+    };
+
+    var readLocal = function() {
+        //从本地客户端读取配置信息
+        var cofig = storage.getItem('tts_cofig');
+        if (cofig) {
+            cofig = JSON.parse(cofig);
+            defaultConfig = cofig;
+        }
+    }
+
+    var writeConfig = function(newConfig) {
+        storage.setItem('tts_cofig', JSON.stringify(newConfig));
+        defaultConfig = newConfig;
+    }
+
+    var synth = window.speechSynthesis;
+    readLocal();
+
+    var speak = function(t, lineCode) {
+        if (defaultConfig.enable != 1)
+            return;
+        if (defaultConfig.queueModel == 1)
+            synth.cancel();
+
+        t = gb_data_basic.codeToLine[lineCode].name + t;
+        //延迟100毫秒，防止中断旧语音时 将新的语音也中断
+        setTimeout(function() {
+            var msg = new SpeechSynthesisUtterance(t);
+            msg.rate = defaultConfig.rate;
+            synth.speak(msg);
+        }, 100);
+    }
+
+    var audition = function(t, rate) {
+        var msg = new SpeechSynthesisUtterance(t);
+        msg.rate = rate;
+        synth.speak(msg);
+    }
+
+    return {
+        readLocal: readLocal,
+        writeConfig: writeConfig,
+        defaultConfig: function() {
+            return defaultConfig
+        },
+        speak: speak,
+        audition: audition
+    };
+})();
@@ -9,14 +9,7 @@ var gb_sch_websocket = (function() {
     schSock.onopen = function(e) {
         console.log('webSocket[realcontrol] onopen');
-        setTimeout(function() {
-            //注册线路监听
-            var data = {
-                operCode: 'register_line',
-                idx: gb_data_basic.line_idx
-            }
-            schSock.send(JSON.stringify(data));
-        }, 500);
+        setTimeout(regListen, 500);
     };
     //接收消息
     schSock.onmessage = function(e) {
@@ -28,9 +21,22 @@ var gb_sch_websocket = (function() {
         }
     };
+    function regListen (){
+    	//注册线路监听
+        var data = {
+            operCode: 'register_line',
+            idx: gb_data_basic.line_idx
+        }
+        schSock.send(JSON.stringify(data));
+        console.log('regListen....', data);
+    }
+
     //断开
     schSock.onclose = function(e) {
         alert('和服务器连接断开....');
+        console.log('和服务器连接断开....');
+        regListen();
+
     };
     //80协议上报
@@ -38,7 +44,11 @@ var gb_sch_websocket = (function() {
        msg.dateStr = moment(msg.timestamp).format('HH:mm');
        msg.text = gb_common.reqCode80[msg.data.requestCode];
-       findMailBox(msg.data.lineId).prepend(temps['sys-note-80-temp'](msg));
+       var $item=$(temps['sys-note-80-temp'](msg));
+       findMailBox(msg.data.lineId).prepend($item);
+       //tts
+       var ttsMsg=$item.find('.uk-panel-title').text();
+       gb_tts.speak(ttsMsg, msg.data.lineId);
     }
     var waitRemoves = [];
@@ -47,12 +57,16 @@ var gb_sch_websocket = (function() {
         gb_schedule_table.updateSchedule(msg.t);
         msg.domId = 'fache_' + msg.t.id + '_' + parseInt(Math.random() * 10000);
-        findMailBox(msg.t.xlBm).prepend(temps['sys-note-42-temp'](msg));
+        var $item=$(temps['sys-note-42-temp'](msg));
+        findMailBox(msg.t.xlBm).prepend($item);
         waitRemoves.push({
             t: currentSecond(),
             dom: msg.domId
         });
+        //tts
+        var ttsMsg=$item.find('.title').text();
+        gb_tts.speak(ttsMsg, msg.t.xlBm);
         gb_schedule_table.calc_yfwf_num(msg.t.xlBm);
     }
@@ -61,11 +75,15 @@ var gb_sch_websocket = (function() {
         gb_schedule_table.updateSchedule(msg.t);
         msg.domId = 'zhongDian_' + msg.t.id + '_' + parseInt(Math.random() * 10000);
-        findMailBox(msg.t.xlBm).prepend(temps['sys-note-42_1-temp'](msg));
+        var $item=$(temps['sys-note-42_1-temp'](msg));
+        findMailBox(msg.t.xlBm).prepend($item);
         waitRemoves.push({
             t: currentSecond(),
             dom: msg.domId
         });
+        //tts
+        var ttsMsg=$item.find('.title').text();
+        gb_tts.speak(ttsMsg, msg.t.xlBm);
     }
     //服务器通知刷新班次
@@ -18,6 +18,7 @@
     <link rel="stylesheet" href="/real_control_v2/css/home.css" />
     <!-- line style -->
     <link rel="stylesheet" href="/real_control_v2/css/line_schedule.css" />
+    <link rel="stylesheet" href="/real_control_v2/css/sch_autocomp_result.css" />
     <!-- custom table -->
     <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" />
     <!-- jquery contextMenu style -->
@@ -118,12 +119,15 @@
     <script src="/real_control_v2/js/line_schedule/sch_table.js"></script>
     <script src="/real_control_v2/js/line_schedule/context_menu.js"></script>
     <script src="/real_control_v2/js/line_schedule/dbclick.js"></script>
+    <script src="/real_control_v2/js/line_schedule/search.js"></script>
     <!-- 字典相关 -->
     <script src="/assets/js/dictionary.js"></script>
     <!-- websocket -->
     <script src="/assets/js/sockjs.min.js"></script>
     <script src="/real_control_v2/js/websocket/sch_websocket.js"></script>
+    <!-- tts -->
+    <script src="/real_control_v2/js/utils/tts.js"></script>
 </body>
 </html>