調整匯款沖帳

# Conflicts:
#	web/App_Code/Model/Model.Designer.cs
#	web/App_Code/Model/Model.cs
#	web/App_Code/Model/Model.edmx
#	web/web.config

web/App_Code/DataAccess/StyleDataAccess.cs

@@ -0,0 +1,351 @@
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Wordprocessing;
+using MINOM.COM.Utility;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.Http.ModelBinding;
+
+/// <summary>
+/// StyleDataAccess 的摘要描述
+/// </summary>
+public class StyleDataAccess
+{
+    LogUtility log=new LogUtility();
+    object[] obj = new object[] { "Y", "" ,null};
+    public StyleDataAccess()
+    {
+        //
+        // TODO: 在這裡新增建構函式邏輯
+        //
+    }
+
+    public object[] AddTabletPaper(TabletPaperSize tps)
+    {
+        try
+        {
+            using (var context = new ezEntities())
+            {
+                StringBuilder sb = new StringBuilder();
+                var sp = new List<SqlParameter>();
+                sb.Append("insert into TabletPaperSize (PaperID,PaperName,Width,Height,CUser,CDate,CTime,UUser,UDate,UTime ) ");
+                sb.Append("values (@PaperID,@PaperName,@Width,@Height,@CUser,@CDate,@CTime,@UUser,@UDate,@UTime )");
+                sp.Add(new SqlParameter("@PaperID",tps.PaperID));
+                sp.Add(new SqlParameter("@PaperName", tps.PaperName));
+                sp.Add(new SqlParameter("@Width", tps.Width));
+                sp.Add(new SqlParameter("@Height", tps.Height));
+                sp.Add(new SqlParameter("@CUser", tps.CUser));
+                sp.Add(new SqlParameter("@CDate", tps.CDate));
+                sp.Add(new SqlParameter("@CTime", tps.CTime));
+                sp.Add(new SqlParameter("@UUser", tps.UUser));
+                sp.Add(new SqlParameter("@UDate", tps.UDate));
+                sp.Add(new SqlParameter("@UTime", tps.UTime));
+                context.Database.ExecuteSqlCommand(sb.ToString(),sp.ToArray());
+            }
+        }
+        catch (Exception ex)
+        {
+            log.writeErrorPath("AddTabletPaper:" + ex.Message + ex.StackTrace);
+            obj[0] = "N";
+            obj[1] = ex.Message;
+        }
+        return obj;
+    }
+    public object[] GetTabletPaper(string paperID, string name)
+    {
+        try
+        {
+            using (var context = new ezEntities())
+            {
+                StringBuilder sb = new StringBuilder();
+                var sp = new List<SqlParameter>();
+
+                sb.Append("select * from TabletPaperSize where 1=1 ");
+                if (!string.IsNullOrEmpty(paperID))
+                {
+                    sb.Append("and PaperID=@PaperID ");
+                    sp.Add(new SqlParameter("@PaperID", paperID));
+                }
+                if (!string.IsNullOrEmpty(name))
+                {
+                    sb.Append("and Name=@Name ");
+                    sp.Add(new SqlParameter("@Name", name));
+                }
+                var data = context.Database.SqlQuery<TabletPaperSize>(sb.ToString(), sp.ToArray()).ToList();
+                obj[2] = data;
+            }
+        }
+        catch (Exception ex)
+        {
+            log.writeErrorPath("GetTabletElement:" + ex.Message + ex.StackTrace);
+            obj[0] = "N";
+            obj[1] = ex.Message;
+        }
+
+        return obj;
+    }
+
+
+    public object[] GetTabletElement(string elementID ,string name)
+    {
+        try
+        {
+            using (var context = new ezEntities())
+            {
+                StringBuilder sb = new StringBuilder();
+                var sp = new List<SqlParameter>();
+
+                sb.Append("select * from TabletElement where 1=1 ");
+                if (!string.IsNullOrEmpty(elementID))
+                {
+                    sb.Append("and ElementID=@ElementID ");
+                    sp.Add(new SqlParameter("@ElementID", elementID));
+                }
+                if (!string.IsNullOrEmpty(name))
+                {
+                    sb.Append("and Name=@Name ");
+                    sp.Add(new SqlParameter("@Name", name));
+                }
+                var data = context.Database.SqlQuery<TabletElement>(sb.ToString(), sp.ToArray()).ToList();
+                obj[2] = data;
+            }
+        }
+        catch (Exception ex)
+        {
+            log.writeErrorPath("GetTabletElement:" + ex.Message + ex.StackTrace);
+            obj[0] = "N";
+            obj[1] = ex.Message;
+        }
+
+        return obj;
+    }
+
+    public object[] GetStyleDetail(string styleID,string elementID)
+    {
+        try
+        {
+            using (var context = new ezEntities())
+            {
+                StringBuilder sb = new StringBuilder();
+                var sp = new List<SqlParameter>();
+
+                sb.Append("select * from TabletStyleDetail where 1=1 ");
+                if (!string.IsNullOrEmpty(styleID))
+                {
+                    sb.Append("and StyleID=@StyleID ");
+                    sp.Add(new SqlParameter("@StyleID", styleID));
+                }
+                if (!string.IsNullOrEmpty(elementID))
+                {
+                    sb.Append("and ElementID=@ElementID ");
+                    sp.Add(new SqlParameter("@ElementID", elementID));
+                }
+                var data = context.Database.SqlQuery<TabletStyleDetail>(sb.ToString(), sp.ToArray()).ToList();
+                obj[2] = data;
+            }
+        }
+        catch (Exception ex)
+        {
+            log.writeErrorPath("GetStyleDetail:" + ex.Message + ex.StackTrace);
+            obj[0] = "N";
+            obj[1] = ex.Message;
+        }
+
+        return obj;
+    }
+    public object[] GetStyle(string id,string name)
+    {
+        try
+        {
+            using (var context = new ezEntities())
+            {
+                StringBuilder sb = new StringBuilder();
+                var sp = new List<SqlParameter>();
+
+                sb.Append("select * from TabletStyle where 1=1 ");
+                if (!string.IsNullOrEmpty(id))
+                {
+                    sb.Append("and StyleID=@StyleID ");
+                    sp.Add(new SqlParameter( "@StyleID",id));
+                }
+                if (!string.IsNullOrEmpty(name))
+                {
+                    sb.Append("and Name=@Name ");
+                    sp.Add(new SqlParameter("@Name", name));
+                }
+               var data= context.Database.SqlQuery<TabletStyle>(sb.ToString(), sp.ToArray()).ToList();
+                obj[2]= data;
+            }
+        }
+        catch (Exception ex)
+        {
+            log.writeErrorPath("GetStyle:" + ex.Message + ex.StackTrace);
+            obj[0] = "N";
+            obj[1] = ex.Message;
+        }
+        return obj;
+    }
+
+    public object[] AddStyle(TabletStyle ts, List<TabletStyleDetail> list)
+    {
+        try
+        {
+            using (var context = new ezEntities())
+            {
+                StringBuilder sb = new StringBuilder();
+                SqlParameter[] sp = new SqlParameter[] {
+                new SqlParameter("@StyleID",ts.StyleID),
+                new SqlParameter("@Name",ts.Name),
+                new SqlParameter("@Descr",ts.Descr),
+                new SqlParameter("@PaperSize",ts.PaperSize),
+                new SqlParameter("@BackendImg",ts.BackendImg),
+                new SqlParameter("@PrintSize",ts.PrintSize),
+                new SqlParameter("@PrintMode",ts.PrintMode),
+                new SqlParameter("@Orientation",ts.Orientation),
+                new SqlParameter("@PrintPageCount",ts.PrintPageCount),
+                new SqlParameter("@RosterLimit",ts.RosterLimit),
+                new SqlParameter("@CUser",""),
+                new SqlParameter("@CDate",""),
+                new SqlParameter("@CTime",""),
+                new SqlParameter("@UUser",""),
+                new SqlParameter("@UDate",""),
+                new SqlParameter("@UTime",""),
+            };
+
+                sb.Append("insert into TabletStyle (StyleID,Name,Descr,PaperSize,BackendImg,PrintSize,PrintMode,Orientation,PrintPageCount,RosterLimit");
+                sb.Append(",CUser,CDate,CTime,UUser,UDate,UTime ) ");
+                sb.Append("values(@StyleID,@Name,@Descr,@PaperSize,@BackendImg,@PrintSize,@PrintMode,@Orientation,@PrintPageCount,@RosterLimit");
+                sb.Append(",@CUser,@CDate,@CTime,@UUser,@UDate,@UTime ) ");
+                context.Database.ExecuteSqlCommand(sb.ToString(), sp);
+
+                sb.Clear();
+                sb.Append("insert into TabletStyleDetail(StyleID,Name,Descr,ElementID,StartX,StartY,FontSize,BreakLen,FontFamily,TwoOffset,");
+                sb.Append("ThreeOffset,FourOffSet,IsActive,Width,Height,TextWidth,TextHeight,CUser,CDate,CTime,UUser,UDate,UTime) ");
+                sb.Append("values (@StyleID,@Name,@Descr,@ElementID,@StartX,@StartY,@FontSize,@BreakLen,@FontFamily,@TwoOffset,");
+                sb.Append("@ThreeOffset,@FourOffSet,@IsActive,@Width,@Height,@TextWidth,@TextHeight,@CUser,@CDate,@CTime,@UUser,@UDate,@UTime) ");
+                foreach (var item in list)
+                {
+                    SqlParameter[] sp1 = new SqlParameter[] {
+                new SqlParameter("@StyleID",item.StyleID),
+                new SqlParameter("@Name",item.Name),
+                new SqlParameter("@Descr",item.Descr),
+                new SqlParameter("@ElementID",item.ElementID),
+                new SqlParameter("@StartX",item.StartX),
+                new SqlParameter("@StartY",item.StartY),
+                new SqlParameter("@FontSize",item.FontSize),
+                new SqlParameter("@BreakLen",item.BreakLen),
+                new SqlParameter("@FontFamily",item.FontFamily),
+                new SqlParameter("@TwoOffset",item.TwoOffset),
+                new SqlParameter("@ThreeOffset",item.ThreeOffset),
+                new SqlParameter("@FourOffset",item.FourOffset),
+                new SqlParameter("@IsActive",item.IsActive),
+                new SqlParameter("@Width",item.Width),
+                new SqlParameter("@Height",item.Height),
+                new SqlParameter("@TextWidth",item.TextWidth),
+                new SqlParameter("@TextHeight",item.TextHeight),
+                new SqlParameter("@CUser",""),
+                new SqlParameter("@CDate",""),
+                new SqlParameter("@CTime",""),
+                new SqlParameter("@UUser",""),
+                new SqlParameter("@UDate",""),
+                new SqlParameter("@UTime",""),
+            };
+                    context.Database.ExecuteSqlCommand(sb.ToString(), sp1.ToArray());
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            log.writeErrorPath("AddStyle:" + ex.Message+ex.StackTrace);
+            obj[0] = "N";
+            obj[1] = ex.Message;
+        }
+        return obj;
+    }
+
+    public object[] UpdateStyle(TabletStyle ts, List<TabletStyleDetail> list)
+    {
+        try
+        {
+            using (var context = new ezEntities())
+            {
+                StringBuilder sb = new StringBuilder();
+                SqlParameter[] sp = new SqlParameter[] {
+                new SqlParameter("@StyleID",ts.StyleID),
+                new SqlParameter("@Name",ts.Name),
+                new SqlParameter("@Descr",ts.Descr),
+                new SqlParameter("@PaperSize",ts.PaperSize),
+                new SqlParameter("@BackendImg",ts.BackendImg),
+                new SqlParameter("@PrintSize",ts.PrintSize),
+                new SqlParameter("@PrintMode",ts.PrintMode),
+                new SqlParameter("@Orientation",ts.Orientation),
+                new SqlParameter("@PrintPageCount",ts.PrintPageCount),
+                new SqlParameter("@RosterLimit",ts.RosterLimit),
+                new SqlParameter("@CUser",""),
+                new SqlParameter("@CDate",""),
+                new SqlParameter("@CTime",""),
+                new SqlParameter("@UUser",""),
+                new SqlParameter("@UDate",""),
+                new SqlParameter("@UTime",""),
+            };
+
+                sb.Append("update TabletStyle set Descr=@Descr,PaperSize=@PaperSize,BackendImg=@BackendImg,PrintSize=@PrintSize,");
+                sb.Append("PrintMode=@PrintMode,Orientation=@Orientation,PrintPageCount=@PrintPageCount,RosterLimit=@RosterLimit,");
+                sb.Append("CUser=@CUser,CDate=@CDate,CTime=@CTime,UUser=@UUSer,UDate=@UDate,UTime=@UTime ");
+                sb.Append("where StyleID=@StyleID ");
+
+                context.Database.ExecuteSqlCommand(sb.ToString(), sp.ToArray());
+
+                sb.Clear();
+                sb.Append("update TabletStyleDetail set Descr=@Descr,StartX=@StartX,StartY=@StartY,FontSize=@FontSize,BreakLen=@BreakLen,");
+                sb.Append("FontFamily=@FontFamily,TwoOffset=@TwoOffset,ThreeOffset=@ThreeOffset,FourOffset=@FourOffset,IsActive=@IsActive,");
+                sb.Append("Width=@Width,Height=@Height,TextWidth=@TextWidth,TextHeight=@TextHeight,UUser=@UUser,UDate=@UDate,UTime=@UTime ");
+                sb.Append("where StyleID=@StyleID and ElementID=@ElementID ");
+                //sb.Append("insert into TabletStyleDetail(StyleID,Name,Descr,ElementID,StartX,StartY,FontSize,BreakLen,FontFamily,TwoOffset,");
+                //sb.Append("ThreeOffset,FourOffSet,IsActive,Width,Height,TextWidth,TextHeight,CUser,CDate,CTime,UUser,UDate,UTime) ");
+                //sb.Append("values (@StyleID,@Name,@Descr,@ElementID,@StartX,@StartY,@FontSize,@BreakLen,@FontFamily,@TwoOffset,");
+                //sb.Append("@ThreeOffset,@FourOffSet,@IsActive,@Width,@Height,@TextWidth,@TextHeight,@CUser,@CDate,@CTime,@UUser,@UDate,@UTime) ");
+                foreach (var item in list)
+                {
+                    SqlParameter[] sp1 = new SqlParameter[] {
+                new SqlParameter("@StyleID",item.StyleID),
+                new SqlParameter("@Name",item.Name),
+                new SqlParameter("@Descr",item.Descr),
+                new SqlParameter("@ElementID",item.ElementID),
+                new SqlParameter("@StartX",item.StartX),
+                new SqlParameter("@StartY",item.StartY),
+                new SqlParameter("@FontSize",item.FontSize),
+                new SqlParameter("@BreakLen",item.BreakLen),
+                new SqlParameter("@FontFamily",item.FontFamily),
+                new SqlParameter("@TwoOffset",item.TwoOffset),
+                new SqlParameter("@ThreeOffset",item.ThreeOffset),
+                new SqlParameter("@FourOffset",item.FourOffset),
+                new SqlParameter("@IsActive",item.IsActive),
+                new SqlParameter("@Width",item.Width),
+                new SqlParameter("@Height",item.Height),
+                new SqlParameter("@TextWidth",item.TextWidth),
+                new SqlParameter("@TextHeight",item.TextHeight),
+                new SqlParameter("@CUser",""),
+                new SqlParameter("@CDate",""),
+                new SqlParameter("@CTime",""),
+                new SqlParameter("@UUser",""),
+                new SqlParameter("@UDate",""),
+                new SqlParameter("@UTime",""),
+            };
+                    context.Database.ExecuteSqlCommand(sb.ToString(), sp1.ToArray());
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            log.writeErrorPath("UpdateStyle:" + ex.Message + ex.StackTrace);
+            obj[0] = "N";
+            obj[1] = ex.Message;
+        }
+        return obj;
+    }
+}

web/App_Code/Entity/Style.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+/// <summary>
+/// Style 的摘要描述
+/// </summary>
+public class TabletStyle
+{
+    public TabletStyle()
+    {
+        //
+        // TODO: 在這裡新增建構函式邏輯
+        //
+    }
+
+    public string StyleID { get; set; }
+    public string Name { get; set; }
+    public string Descr { get; set; }
+    public string PaperSize {  get; set; }
+    public string BackendImg    { get; set; }
+    public string PrintSize { get; set; }
+    public string PrintMode { get; set; }
+    public string Orientation { get; set; }
+    public string PrintPageCount { get; set; }
+    public string RosterLimit { get; set; }
+    public string CUser { get; set; }
+    public string CDate { get; set; }
+    public string CTime { get; set; }
+    public string UUser {  get; set; }
+    public string UDate { get; set; }
+    public string UTime { get; set; }
+}
+
+public class TabletStyleDetail
+{
+    public TabletStyleDetail() { }
+    public string StyleID { get; set; }
+    public string Name { get; set; }
+    public string Descr { get; set; }
+    public string ElementID { get; set; }
+    public string StartX { get; set; }
+    public string StartY { get; set; }
+    public string FontSize { get; set; }
+    public string FontFamily { get; set; }
+    public string TwoOffset { get; set; }
+    public string ThreeOffset { get; set; }
+    public string FourOffset { get; set; }
+    public string IsActive { get; set; }
+    public string Width { get; set; }
+    public string Height { get; set; }
+    public string TextWidth { get; set; }
+    public string TextHeight { get; set; }
+    public string BreakLen { get; set; }
+    public string CUser { get; set; }
+    public string CDate { get; set; }
+    public string CTime { get; set; }
+    public string UUser { get; set; }
+    public string UDate { get; set; }
+    public string UTime { get; set; }
+}
+
+public class TabletElement
+{
+    public TabletElement() { }
+    public string ElementID { get; set; }
+    public string Name { get; set; }
+    public string ElementType { get; set; }
+    public string SampleContent { get; set; }
+    public string CUser { get; set; }
+    public string CDate { get; set; }
+    public string CTime { get; set; }
+    public string UUser { get; set; }
+    public string UDate { get; set; }
+    public string UTime { get; set; }
+}
+
+public class TabletPaperSize
+{
+    public TabletPaperSize() { }
+    public string PaperID { get; set; }
+    public string PaperName { get; set; }
+    public string Width { get; set; }
+    public string Height { get; set; }
+    public string CUser { get; set; }
+    public string CDate { get; set; }
+    public string CTime { get; set; }
+    public string UUser { get; set; }
+    public string UDate { get; set; }
+    public string UTime { get; set; }
+}

web/App_Code/Model/Model.Designer.cs

@@ -1,4 +1,4 @@
-// 已啟用模型 'D:\dev\ez\17168erp\git_17888\web\App_Code\Model\Model.edmx' 的 T4 程式碼產生。
+// 已啟用模型 'D:\project\17168ERP\web\App_Code\Model\Model.edmx' 的 T4 程式碼產生。
 // 若要啟用舊版程式碼產生，請將 [程式碼產生策略] 設計工具屬性的值
 //變更為 [舊版 ObjectContext]。當模型在設計工具中開啟時，這個屬性便可
 //以在 [屬性] 視窗中使用。

web/App_Code/Model/Model.cs

@@ -184,6 +184,10 @@ namespace Model
         public string partno { get; set; }
         public string print_init { get; set; }
         public string is_reconcile { get; set; }
+        public string pageSize { get; set; }
+        public string printSize { get; set; }
+        public string defaultStyle { get; set; }
+        public Nullable<int> sort_order { get; set; }
     
         public virtual actItem_kind actItem_kind { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
@@ -1389,6 +1393,7 @@ namespace Model
         public Nullable<int> parent_num { get; set; }
         public string print_id { get; set; }
         public Nullable<System.DateTime> UpdateTime { get; set; }
+        public string style { get; set; }
     
         public virtual actItem actItem { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]

web/App_Code/Model/Model.edmx

@@ -91,6 +91,10 @@
           <Property Name="customize_data" Type="nvarchar(max)" />
           <Property Name="reg_time" Type="datetime" />
           <Property Name="is_reconcile" Type="nvarchar" MaxLength="1" />
+          <Property Name="pageSize" Type="varchar" MaxLength="50" />
+          <Property Name="printSize" Type="varchar" MaxLength="50" />
+          <Property Name="defaultStyle" Type="varchar" MaxLength="50" />
+          <Property Name="sort_order" Type="int" />
         </EntityType>
         <EntityType Name="actItem_files">
           <Key>
@@ -480,7 +484,7 @@
           <Property Name="country" Type="nvarchar" MaxLength="5" />
           <Property Name="appellation_id" Type="int" />
           <Property Name="follower_hash" Type="nvarchar" MaxLength="100" />
-          <Property Name="search_keywords" Type="nvarchar(max)" />
+          <Property Name="search_keywords" Type="varchar(max)" />
         </EntityType>
         <EntityType Name="followers_tablet">
           <Key>
@@ -604,8 +608,8 @@
           </Key>
           <Property Name="num" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="kind" Type="nvarchar" MaxLength="100" />
-          <Property Name="starttime" Type="time" Precision="0" />
-          <Property Name="offtime" Type="time" Precision="0" />
+          <Property Name="starttime" Type="time" Precision="7" />
+          <Property Name="offtime" Type="time" Precision="7" />
           <Property Name="resttime" Type="int" />
           <Property Name="root" Type="int" />
           <Property Name="range" Type="int" />
@@ -724,6 +728,7 @@
           <Property Name="customize_data" Type="nvarchar(max)" />
           <Property Name="printed_files" Type="nvarchar(max)" />
           <Property Name="UpdateTime" Type="datetime2" Precision="7" />
+          <Property Name="style" Type="varchar" MaxLength="50" />
         </EntityType>
         <EntityType Name="pro_order_record">
           <Key>
@@ -980,7 +985,7 @@
           <Property Name="balance_act_item" Type="int" />
           <Property Name="balance_pro_order_detail" Type="int" />
         </EntityType>
-        <Association Name="FK__Ancestral__Regis__4DF47A4E">
+        <Association Name="FK__Ancestral__Regis__1A9EF37A">
           <End Role="AncestralTabletRegistrant" Type="Self.AncestralTabletRegistrant" Multiplicity="1" />
           <End Role="AncestralTabletPositionRecord" Type="Self.AncestralTabletPositionRecord" Multiplicity="*" />
           <ReferentialConstraint>
@@ -1079,7 +1084,9 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_act_bom_actItem1">
-          <End Role="actItem" Type="Self.actItem" Multiplicity="0..1" />
+          <End Role="actItem" Type="Self.actItem" Multiplicity="0..1">
+            <OnDelete Action="Cascade" />
+          </End>
           <End Role="act_bom" Type="Self.act_bom" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="actItem">
@@ -1128,18 +1135,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_activity_activity_kind">
-          <End Role="activity_kind" Type="Self.activity_kind" Multiplicity="0..1" />
-          <End Role="activity" Type="Self.activity" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="activity_kind">
-              <PropertyRef Name="num" />
-            </Principal>
-            <Dependent Role="activity">
-              <PropertyRef Name="kind" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_activity_check_activity">
           <End Role="activity" Type="Self.activity" Multiplicity="0..1">
             <OnDelete Action="Cascade" />
@@ -1211,7 +1206,9 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_activity_relating_activity">
-          <End Role="activity" Type="Self.activity" Multiplicity="1" />
+          <End Role="activity" Type="Self.activity" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
           <End Role="activity_relating" Type="Self.activity_relating" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="activity">
@@ -1637,7 +1634,9 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_pro_order_activity">
-          <End Role="activity" Type="Self.activity" Multiplicity="0..1" />
+          <End Role="activity" Type="Self.activity" Multiplicity="0..1">
+            <OnDelete Action="Cascade" />
+          </End>
           <End Role="pro_order" Type="Self.pro_order" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="activity">
@@ -1687,7 +1686,9 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_pro_order_detail_pro_order">
-          <End Role="pro_order" Type="Self.pro_order" Multiplicity="1" />
+          <End Role="pro_order" Type="Self.pro_order" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
           <End Role="pro_order_detail" Type="Self.pro_order_detail" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="pro_order">
@@ -1699,7 +1700,9 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_pro_order_followers">
-          <End Role="followers" Type="Self.followers" Multiplicity="0..1" />
+          <End Role="followers" Type="Self.followers" Multiplicity="0..1">
+            <OnDelete Action="Cascade" />
+          </End>
           <End Role="pro_order" Type="Self.pro_order" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="followers">
@@ -2157,7 +2160,7 @@
           <EntitySet Name="supplier" EntityType="Self.supplier" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="supplier_kind" EntityType="Self.supplier_kind" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="transfer_register" EntityType="Self.transfer_register" Schema="dbo" store:Type="Tables" />
-          <AssociationSet Name="FK__Ancestral__Regis__4DF47A4E" Association="Self.FK__Ancestral__Regis__4DF47A4E">
+          <AssociationSet Name="FK__Ancestral__Regis__1A9EF37A" Association="Self.FK__Ancestral__Regis__1A9EF37A">
             <End Role="AncestralTabletRegistrant" EntitySet="AncestralTabletRegistrant" />
             <End Role="AncestralTabletPositionRecord" EntitySet="AncestralTabletPositionRecord" />
           </AssociationSet>
@@ -2205,10 +2208,6 @@
             <End Role="activity_category_kind" EntitySet="activity_category_kind" />
             <End Role="activity" EntitySet="activity" />
           </AssociationSet>
-          <AssociationSet Name="FK_activity_activity_kind" Association="Self.FK_activity_activity_kind">
-            <End Role="activity_kind" EntitySet="activity_kind" />
-            <End Role="activity" EntitySet="activity" />
-          </AssociationSet>
           <AssociationSet Name="FK_activity_check_activity" Association="Self.FK_activity_check_activity">
             <End Role="activity" EntitySet="activity" />
             <End Role="activity_check" EntitySet="activity_check" />
@@ -2613,6 +2612,10 @@
           <Property Name="print_init" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
           <NavigationProperty Name="transfer_register" Relationship="Model.FK_transfer_register_actItem" FromRole="actItem" ToRole="transfer_register" />
           <Property Name="is_reconcile" Type="String" MaxLength="1" FixedLength="false" Unicode="true" />
+          <Property Name="pageSize" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="printSize" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="defaultStyle" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="sort_order" Type="Int32" ConcurrencyMode="None" />
           </EntityType>
         <EntityType Name="actItem_files">
           <Key>
@@ -2972,7 +2975,7 @@
           <NavigationProperty Name="transfer_register" Relationship="Model.FK_transfer_register_followers" FromRole="follower" ToRole="transfer_register" />
           <NavigationProperty Name="transfer_register1" Relationship="Model.FK_transfer_register_followers_match" FromRole="follower" ToRole="transfer_register" />
           <NavigationProperty Name="GuaDanOrder" Relationship="Model.FK_GuaDanOrder_Followers" FromRole="follower" ToRole="GuaDanOrder" />
-          <Property Name="search_keywords" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="search_keywords" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
           <NavigationProperty Name="GuaDanOrderGuest" Relationship="Model.FK_GuaDanOrderGuest_FOLLOWERS" FromRole="follower" ToRole="GuaDanOrderGuest" />
         </EntityType>
         <EntityType Name="followers_tablet">
@@ -3062,8 +3065,8 @@
           </Key>
           <Property Name="num" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="kind" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
-          <Property Name="starttime" Type="Time" Precision="0" />
-          <Property Name="offtime" Type="Time" Precision="0" />
+          <Property Name="starttime" Type="Time" Precision="7" />
+          <Property Name="offtime" Type="Time" Precision="7" />
           <Property Name="resttime" Type="Int32" />
           <Property Name="root" Type="Int32" />
           <Property Name="range" Type="Int32" />
@@ -3188,6 +3191,7 @@
           <Property Name="UpdateTime" Type="DateTime" Precision="7" />
           <NavigationProperty Name="accountings" Relationship="Model.FK_accounting_pro_order_detail" FromRole="pro_order_detail" ToRole="accounting" />
           <NavigationProperty Name="transfer_register" Relationship="Model.FK_transfer_register_pro_order_detail" FromRole="pro_order_detail" ToRole="transfer_register" />
+          <Property Name="style" Type="String" Unicode="false" FixedLength="false" MaxLength="50" Nullable="true" />
         </EntityType>
         <EntityType Name="pro_order_record">
           <Key>
@@ -5334,6 +5338,10 @@
           <EntitySetMapping Name="actItems">
             <EntityTypeMapping TypeName="Model.actItem">
               <MappingFragment StoreEntitySet="actItem">
+                <ScalarProperty Name="sort_order" ColumnName="sort_order" />
+                <ScalarProperty Name="defaultStyle" ColumnName="defaultStyle" />
+                <ScalarProperty Name="printSize" ColumnName="printSize" />
+                <ScalarProperty Name="pageSize" ColumnName="pageSize" />
                 <ScalarProperty Name="is_reconcile" ColumnName="is_reconcile" />
                 <ScalarProperty Name="print_init" ColumnName="print_init" />
                 <ScalarProperty Name="partno" ColumnName="partno" />
@@ -5863,6 +5871,7 @@
                 <ScalarProperty Name="demo" ColumnName="demo" />
                 <ScalarProperty Name="customize_data" ColumnName="customize_data" />
                 <ScalarProperty Name="printed_files" ColumnName="printed_files" />
+				  <ScalarProperty Name="style" ColumnName="style" />
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>

web/App_Code/Model/Model.edmx.diagram

@@ -4,12 +4,12 @@
   <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
-      <Diagram DiagramId="b267a343dc0c4bf0ae194b775754b108" Name="Diagram1" ZoomLevel="78">
+      <Diagram DiagramId="b267a343dc0c4bf0ae194b775754b108" Name="Diagram1" ZoomLevel="116">
         <EntityTypeShape EntityType="Model.accounting" Width="1.5" PointX="22.5" PointY="22.125" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.accounting_files" Width="1.5" PointX="15.75" PointY="27.75" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.accounting_kind" Width="1.5" PointX="11.25" PointY="27.625" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.accounting_kind2" Width="1.5" PointX="13.5" PointY="11.25" IsExpanded="true" />
-        <EntityTypeShape EntityType="Model.actItem" Width="1.5" PointX="9.25" PointY="7.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="Model.actItem" Width="1.5" PointX="8.375" PointY="27.25" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.actItem_files" Width="1.5" PointX="16.5" PointY="5.875" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.actItem_kind" Width="1.5" PointX="6.125" PointY="7.875" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.activity" Width="1.5" PointX="3" PointY="8.875" IsExpanded="true" />
@@ -17,7 +17,7 @@
         <EntityTypeShape EntityType="Model.activity_check" Width="1.5" PointX="5.25" PointY="18.5" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.activity_kind" Width="1.5" PointX="0.75" PointY="11.625" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.activity_kind_detail" Width="1.5" PointX="13.5" PointY="3.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="Model.activity_relating" Width="1.5" PointX="10.5" PointY="9.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="Model.activity_relating" Width="1.5" PointX="11.25" PointY="9.875" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.activity_spares" Width="1.5" PointX="13.5" PointY="7.75" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.admin" Width="1.5" PointX="6" PointY="1.375" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.admin_group" Width="1.5" PointX="3.75" PointY="3.625" IsExpanded="true" />

web/App_Code/admin.cs

@@ -28,7 +28,7 @@ namespace MyWeb
         public AdmItem info { get; set; }
 
         //定義欄位cookie==================start
-        public class AdmItem
+        public class  AdmItem
         {
             public int num { get; set; } 
             public string u_id { get; set; }

web/App_Code/api/FollowerController.cs

@@ -103,17 +103,18 @@ public class FollowerController : ApiController
             {               
                 foreach (var item in prod)
                 {
-                    foreach (var item2 in item.pro_order_detail1)
-                        item2.from_id = null; //清空訂單明細的陽上報恩者from_id //f_num設定串聯刪除
+                    //foreach (var item2 in item.pro_order_detail1)
+                    //    item2.from_id = null; //清空訂單明細的陽上報恩者from_id //f_num設定串聯刪除
 
-                    foreach (var item2 in item.pro_order)
-                        item2.introducer = null; 
+                    //foreach (var item2 in item.pro_order)
+                    //    item2.introducer = null; 
 
-                    item.leader = null;//清空leader
+                    //item.leader = null;//清空leader
+                    _db.followers.RemoveRange(prod);
 
                 }
 
-                _db.followers.RemoveRange(prod);
+                //_db.followers.RemoveRange(prod);
                 _db.SaveChanges();
 
                 Model.admin_log admin_log = new Model.admin_log();
@@ -150,8 +151,10 @@ public class FollowerController : ApiController
             qry = qry.Where(o => o.u_name.Contains(q.u_name.Trim()));
         if (q.birthday.HasValue)
             qry = qry.Where(o => o.birthday >= q.birthday.Value);
-        if (q.birthday2.HasValue) 
-            qry = qry.Where(o => o.birthday < Convert.ToDateTime(q.birthday2.Value).AddDays(1));
+        if (q.birthday2.HasValue) {
+            var tmpBirthday2 = Convert.ToDateTime(q.birthday2.Value).AddDays(1);
+            qry = qry.Where(o => o.birthday < tmpBirthday2);
+        }
         if (!string.IsNullOrEmpty(q.address))
             qry = qry.Where(o => o.address !=null &&  o.address.Contains(q.address.Trim()));
         //if (q.num.HasValue && q.num.Value>0)
@@ -655,8 +658,10 @@ public class FollowerController : ApiController
             list = orderrecord.Select(x => new
             {
                 orderno = x.order_no,
-                startdate = x.reg_time,
-                endtime = x.up_time,
+                //startdate = x.reg_time,
+                //endtime = x.up_time,
+                startdate = x.activity.startDate_solar,
+                enddate = x.activity.endDate_solar,
                 pwcount = x.pro_order_detail.Where(a => a.actItem.act_bom.Where(b => b.item_num == a.actItem_num && b.package_num == null).Count() == 0).Count(),
                 amount = x.pro_order_detail.Select(o => (float?)o.price).Sum(),
                 activityname = x.activity.subject,

web/App_Code/api/activityController.cs

@@ -1,14 +1,18 @@
-using System;
+using DocumentFormat.OpenXml.Drawing.Spreadsheet;
+using Model;
+using Newtonsoft.Json;
+using Org.BouncyCastle.Crypto;
+using PagedList;
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Data.Entity;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
-using PagedList;
-using Newtonsoft.Json;
-using System.Collections;
+using System.Web.Services;
 using static TreeView;
-using System.Data.Entity;
 
 // api/activity
 //[ezAuthorize(Roles = "admin")]//群組:*
@@ -126,6 +130,12 @@ public class activityController : ApiController
         if (prod != null)
         {
             ////prod.IsDel = true; ////不確定是否新增欄位? 先註解
+
+            // 先刪除子項目
+            var prod2 = _db.act_bom.Where(q => q.package_num == prod.num).ToList();
+            _db.act_bom.RemoveRange(prod2);
+
+            _db.actItems.Remove(prod);
             _db.SaveChanges();
             Model.admin_log admin_log = new Model.admin_log();
             MyWeb.admin admin = new MyWeb.admin();//api裡不可以用MyWeb
@@ -190,12 +200,18 @@ public class activityController : ApiController
             if (prod.Count() > 0)
             {
                 //var prod2 = _db.actItem_files.AsEnumerable().Where(q => ids.Contains(Convert.ToInt32(q.actItem_num))).ToList();
-                var prod2 = _db.actItem_files.Where(q => ids.Contains(q.actItem_num)).ToList();
-                if (prod2.Count > 0)
-                {
-                    _db.actItem_files.RemoveRange(prod2);
-                    //_db.SaveChanges();
-                }
+                //var prod2 = _db.actItem_files.Where(q => ids.Contains(q.actItem_num)).ToList();
+                //if (prod2.Count > 0)
+                //{
+                //    _db.actItem_files.RemoveRange(prod2);
+                //    //_db.SaveChanges();
+                //}
+
+                // 先刪除子項目
+                var parentBoms = _db.act_bom.Where(q => q.item_num.HasValue && ids.Contains(q.item_num.Value)).ToList();
+                var parentIds = parentBoms.Select(x => x.num).ToList();     // 取得母件 id
+                var childBoms = _db.act_bom.Where(q => q.package_num.HasValue && parentIds.Contains(q.package_num.Value)).ToList();
+                _db.act_bom.RemoveRange(childBoms);
 
                 _db.actItems.RemoveRange(prod);
                 _db.SaveChanges();
@@ -282,6 +298,7 @@ public class activityController : ApiController
 
         var count = qry.Count(); //pageSize = count;//一次取回??
         var qryList = (pageSize > 0) ? qry.ToPagedList(page, pageSize).ToList() : qry.ToList();
+        
         var ret = new
         {
             list = qryList.Select(x => new
@@ -301,17 +318,48 @@ public class activityController : ApiController
                 startDate_lunar = x.startDate_lunar,
                 endDate_lunar = x.endDate_lunar,
                 dueDate = x.dueDate,
+               orderCounts= _db.pro_order.Where(y => y.activity_num == x.num).Count(),
+    }),
+            count = count,
             
-            }),
-            count = count
 
-        };
+    };
 
 
         if (ret.list == null) throw new HttpResponseException(HttpStatusCode.NotFound);
         return Ok(ret);
     }
 
+    public class SortOrderRequest
+    {
+        public List<int> ids { get; set; }
+    }
+
+    [HttpPost]
+    [Route("api/activity/SaveItemList")]
+    public IHttpActionResult UpdateSortOrder([FromBody] SortOrderRequest request)
+    {
+        if (request == null || request.ids == null) return BadRequest();
+
+        using (Model.ezEntities _db = new Model.ezEntities())
+        {
+            int totalCount = request.ids.Count;
+
+            for (int i = 0; i < totalCount; i++)
+            {
+                int id = request.ids[i];
+                var item = _db.actItems.FirstOrDefault(x => x.num == id);
+                if (item != null)
+                {
+                    // 改成總數減去索引，這樣第一筆 (i=0) 會拿到最大的數字
+                    item.sort_order = totalCount - i;
+                }
+            }
+            _db.SaveChanges();
+        }
+        return Ok();
+    }
+
     [HttpPost]
     [Route("api/activity/GetItemList")]
     public IHttpActionResult GetItemList([FromBody] Model.ViewModel.actItem q, int page, int pageSize = 10,
@@ -416,8 +464,14 @@ public class activityController : ApiController
             else
                 qry = qry.OrderBy(o => o.status);
         }
-        else
+        else if (sortBy.Equals("num"))
+        {
             qry = qry.OrderByDescending(o => o.num);
+        }
+        else
+        {
+            qry = qry.OrderByDescending(o => o.sort_order);
+        }
 
         var tdesc = publicFun.enum_desc<Model.activity.category>();
         var count = qry.Count(); //pageSize = count;//一次取回??
@@ -750,7 +804,7 @@ public class activityController : ApiController
 
             //已有值
             var count = qry.Count(); //pageSize = count;//一次取回??
-            var qryList = (pageSize > 0) ? qry.ToPagedList(page, pageSize).ToList() : qry.ToList();
+            var qryList = (pageSize > 0) ? qry.OrderBy(a=>a.num).ToPagedList(page, pageSize).ToList() : qry.ToList();
             var ret = new
             {
                 list = qryList.Select(x => new
@@ -1301,7 +1355,7 @@ public class activityController : ApiController
     [Route("api/activity/OrderCheckIn")]
     public IHttpActionResult OrderCheckIn([FromBody] Model.activity_check item)
     {
-        if (item.f_num.HasValue && item.activity_num.HasValue && item.qty.HasValue && item.status.HasValue)
+        if (item.f_num.HasValue && item.activity_num.HasValue && item.status.HasValue)
         {
             //同一天不能簽到兩次以上            
             Model.activity_check check = _db.activity_check

web/App_Code/api/designerController.cs

@@ -0,0 +1,302 @@
+using Microsoft.Ajax.Utilities;
+using MINOM.COM.Utility;
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Web;
+using System.Web.Http;
+
+/// <summary>
+/// designerController 的摘要描述
+/// </summary>
+public class designerController : ApiController
+{
+    private Model.ezEntities _db = new Model.ezEntities();
+    public designerController()
+    {
+        //
+        // TODO: 在這裡新增建構函式邏輯
+        //
+    }
+
+
+    [HttpPost]
+    [Route("api/tablet/GetActItem")]
+    public IHttpActionResult GetActItem([FromBody] dynamic data)
+    {
+        LogUtility log = new LogUtility();
+        var json = data;
+        string itemNum = (json == null || json.itemNum == null) ? "" : (string)json.itemNum;
+        int num = int.Parse(itemNum);
+        var item=_db.actItems.AsQueryable().Where(x => x.num == num).FirstOrDefault();
+        return Ok(new { result = "Y", data =item});
+    }
+
+    [HttpPost]
+    [Route("api/tablet/GetTabletElement")]
+    public IHttpActionResult GetTabletElement([FromBody] dynamic data)
+    {
+        LogUtility log = new LogUtility();
+        var json = data;
+        string elementID = (json == null || json.elementID == null) ? "" : (string)json.elementID;
+        object[] obj = new StyleDataAccess().GetTabletElement(elementID, "");
+        if (obj[0].ToString() == "Y")
+        {
+            return Ok(new { result = "Y", data = obj[2] });
+        }
+        else
+        {
+            return Ok(new { result = "N", message = obj[1] });
+            //throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+        //return Ok(data);
+    }
+
+    [HttpPost]
+    [Route("api/tablet/GetStyleDetailData")]
+    public IHttpActionResult GetStyleDetailData([FromBody] dynamic data)
+    {
+        LogUtility log = new LogUtility();
+        var json = data;
+        string styleID = (json == null || json.styleID == null) ? "" : (string)json.styleID;
+        object[] obj = new StyleDataAccess().GetStyleDetail(styleID, "");
+        if (obj[0].ToString() == "Y")
+        {
+            return Ok(new { result = "Y", data = obj[2] });
+        }
+        else
+        {
+            return Ok(new { result = "N", message = obj[1] });
+            //throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+        //return Ok(data);
+    }
+
+    [HttpPost]
+    [Route("api/tablet/saveFamily")]
+    public IHttpActionResult saveFamily([FromBody] family_members familyMember)
+    {
+        LogUtility log = new LogUtility();
+        _db.family_members.Add(familyMember);
+        _db.SaveChanges();
+        return Ok(new { result = "Y", data= familyMember });
+
+        //object[] obj = new StyleDataAccess().GetStyle("", "");
+        //if (obj[0].ToString() == "Y")
+        //{
+        //    return Ok(new { result = "Y", data = obj[2] });
+        //}
+        //else
+        //{
+        //    return Ok(new { result = "N", message = obj[1] });
+        //    //throw new HttpResponseException(HttpStatusCode.NotFound);
+        //}
+        //return Ok(data);
+    }
+
+    [HttpPost]
+    [Route("api/tablet/GetStyleData")]
+    public IHttpActionResult GetStyleData([FromBody] dynamic data)
+    {
+        LogUtility log = new LogUtility();
+
+        object[] obj = new StyleDataAccess().GetStyle("", "");
+        if (obj[0].ToString() == "Y")
+        {
+            return Ok(new { result = "Y", data = obj[2] });
+        }
+        else
+        {
+            return Ok(new { result = "N", message = obj[1] });
+            //throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+        //return Ok(data);
+    }
+
+    [HttpPost]
+    [Route("api/tablet/SavDegignerData")]
+    public IHttpActionResult SavDegignerData([FromBody] dynamic data)
+    {
+        LogUtility log = new LogUtility();
+        var json = data;
+        //json.detail.Children<JObject>()
+        log.writeLogPath((string)json.styleName);
+        TabletStyle ts = new TabletStyle();
+        List<TabletStyleDetail> list = new List<TabletStyleDetail>();
+        ts.StyleID = (json == null || json.styleID == null) ? "" : (string)json.styleID;
+        string mode = "edit";
+        if (string.IsNullOrEmpty(ts.StyleID))
+        {
+            ts.StyleID = DateTime.Now.ToString("yyyyMMddHHmmss");
+            mode = "add";
+        }
+        ts.Name = (json == null || json.styleName == null) ? "" : (string)json.styleName;
+        ts.Descr = (json == null || json.descr == null) ? "" : (string)json.descr;
+        ts.PaperSize = (json == null || json.paperSize == null) ? "" : (string)json.paperSize;
+        ts.BackendImg = (json == null || json.backendImg == null) ? "" : (string)json.backendImg;
+        ts.PrintSize = (json == null || json.printSize == null) ? "" : (string)json.printSize;
+        ts.Orientation = (json == null || json.orientation == null) ? "" : (string)json.orientation;
+        ts.PrintPageCount = (json == null || json.printPageCount == null) ? "" : (string)json.printPageCount;
+        ts.PrintMode = (json == null || json.printMode == null) ? "" : (string)json.printMode;
+        ts.RosterLimit=(json == null || json.rosterLimit == null) ? "" : (string)json.rosterLimit;
+        foreach (var item in json.detail.Children<JObject>())
+        {
+            TabletStyleDetail tsd = new TabletStyleDetail();
+            tsd.StyleID = ts.StyleID;
+            tsd.Name = item.name == null ? "" : (string)item.name;
+            tsd.Descr = item.descr == null ? "" : (string)item.descr;
+            tsd.ElementID = item.elementID == null ? "" : (string)item.elementID;
+            tsd.StartX = item.startX == null ? "" : (string)item.startX;
+            tsd.StartY = item.startY == null ? "" : (string)item.startY;
+            tsd.FontSize = item.fontSize == null ? "" : (string)item.fontSize;
+            tsd.FontFamily = item.fontFamily == null ? "" : (string)item.fontFamily;
+            tsd.BreakLen = item.breakLen == null ? "" : (string)item.breakLen;
+            tsd.Width = item.width == null ? "" : (string)item.width;
+            tsd.Height = item.height == null ? "" : (string)item.height;
+            tsd.TextWidth = item.textWidth == null ? "" : (string)item.textWidth;
+            tsd.TextHeight = item.textHeight == null ? "" : (string)item.textHeight;
+            tsd.TwoOffset = item.twoOffset == null ? "" : (string)item.twoOffset;
+            tsd.ThreeOffset = item.threeOffset == null ? "" : (string)item.threeOffset;
+            tsd.FourOffset = item.fourOffset == null ? "" : (string)item.fourOffset;
+            tsd.IsActive = item.isActive == null ? "" : (string)item.isActive;
+            list.Add(tsd);
+        }
+        if (mode == "add")
+        {
+            object[] obj = new StyleDataAccess().AddStyle(ts, list);
+            if (obj[0].ToString() == "Y")
+            {
+                return Ok(new { result = "Y" });
+            }
+            else
+            {
+                return Ok(new { result = "N" });
+            }
+        }
+        return Ok();
+    }
+
+
+
+    [HttpPost]
+    [Route("api/tablet/UpdateDegignerData")]
+    public IHttpActionResult UpdateDegignerData([FromBody] dynamic data)
+    {
+        LogUtility log = new LogUtility();
+        var json = data;
+        //json.detail.Children<JObject>()
+        log.writeLogPath((string)json.styleName);
+        TabletStyle ts = new TabletStyle();
+        List<TabletStyleDetail> list = new List<TabletStyleDetail>();
+        ts.StyleID = (json == null || json.styleID == null) ? "" : (string)json.styleID;
+        string mode = "edit";
+        if (string.IsNullOrEmpty(ts.StyleID))
+        {
+            ts.StyleID = DateTime.Now.ToString("yyyyMMddHHmmss");
+            mode = "add";
+        }
+        ts.Name = (json == null || json.styleName == null) ? "" : (string)json.styleName;
+        ts.Descr = (json == null || json.descr == null) ? "" : (string)json.descr;
+        ts.PaperSize = (json == null || json.paperSize == null) ? "" : (string)json.paperSize;
+        ts.BackendImg = (json == null || json.backendImg == null) ? "" : (string)json.backendImg;
+        ts.PrintSize = (json == null || json.printSize == null) ? "" : (string)json.printSize;
+        ts.Orientation = (json == null || json.orientation == null) ? "" : (string)json.orientation;
+        ts.PrintPageCount = (json == null || json.printPageCount == null) ? "" : (string)json.printPageCount;
+        ts.PrintMode = (json == null || json.printMode == null) ? "" : (string)json.printMode;
+        ts.RosterLimit = (json == null || json.rosterLimit == null) ? "" : (string)json.rosterLimit;
+        foreach (var item in json.detail.Children<JObject>())
+        {
+            TabletStyleDetail tsd = new TabletStyleDetail();
+            tsd.StyleID = ts.StyleID;
+            tsd.Name = item.name == null ? "" : (string)item.name;
+            tsd.Descr = item.descr == null ? "" : (string)item.descr;
+            tsd.ElementID = item.elementID == null ? "" : (string)item.elementID;
+            tsd.StartX = item.startX == null ? "" : (string)item.startX;
+            tsd.StartY = item.startY == null ? "" : (string)item.startY;
+            tsd.FontSize = item.fontSize == null ? "" : (string)item.fontSize;
+            tsd.FontFamily = item.fontFamily == null ? "" : (string)item.fontFamily;
+            tsd.BreakLen = item.breakLen == null ? "" : (string)item.breakLen;
+            tsd.Width = item.width == null ? "" : (string)item.width;
+            tsd.TwoOffset = item.twoOffset == null ? "" : (string)item.twoOffset;
+            tsd.ThreeOffset = item.threeOffset == null ? "" : (string)item.threeOffset;
+            tsd.FourOffset = item.fourOffset == null ? "" : (string)item.fourOffset;
+            tsd.IsActive = item.isActive == null ? "" : (string)item.isActive;
+            tsd.Width = item.width == null ? "" : (string)item.width;
+            tsd.Height = item.height == null ? "" : (string)item.height;
+            tsd.TextWidth = item.textWidth == null ? "" : (string)item.textWidth;
+            tsd.TextHeight = item.textHeight == null ? "" : (string)item.textHeight;
+            list.Add(tsd);
+        }
+
+        object[] obj = new StyleDataAccess().UpdateStyle(ts, list);
+        if (obj[0].ToString() == "Y")
+        {
+            return Ok(new { result = "Y" });
+        }
+        else
+        {
+            return Ok(new { result = "N" });
+        }
+    }
+
+
+    [HttpPost]
+    [Route("api/tablet/GetPaperSize")]
+    public IHttpActionResult GetPaperSize([FromBody] dynamic data)
+    {
+        LogUtility log = new LogUtility();
+
+        object[] obj = new StyleDataAccess().GetTabletPaper("", "");
+        if (obj[0].ToString() == "Y")
+        {
+            return Ok(new { result = "Y", data = obj[2] });
+        }
+        else
+        {
+            return Ok(new { result = "N", message = obj[1] });
+            //throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+        //return Ok(data);
+    }
+
+
+    [HttpPost]
+    [Route("api/tablet/SavePaperSize")]
+    public IHttpActionResult SavePaperSize([FromBody] dynamic data)
+    {
+        LogUtility log = new LogUtility();
+        var json = data;
+        //json.detail.Children<JObject>()
+        log.writeLogPath((string)json.styleName);
+        TabletPaperSize tps = new TabletPaperSize();
+        tps.PaperID = (json == null || json.paperID == null) ? "" : (string)json.paperID;
+        if (string.IsNullOrEmpty(tps.PaperID))
+        {
+            tps.PaperID = DateTime.Now.ToString("yyyyMMddHHmmss");
+        }
+        tps.PaperName = (json == null || json.paperName == null) ? "" : (string)json.paperName;
+        tps.Width = (json == null || json.width == null) ? "" : (string)json.width;
+        tps.Height = (json == null || json.height == null) ? "" : (string)json.height;
+        tps.CUser = "";
+        tps.CDate = DateTime.Now.ToString("yyyyMMdd");
+        tps.CTime = DateTime.Now.ToString("HHmmss");
+        tps.UUser = "";
+        tps.UDate = DateTime.Now.ToString("yyyyMMdd");
+        tps.UTime = DateTime.Now.ToString("HHmmss");
+
+        object[] obj = new StyleDataAccess().AddTabletPaper(tps);
+        if (obj[0].ToString()=="Y")
+        {
+            return Ok(new { result = "Y" });
+        }
+        else
+        {
+            return Ok(new { result = "N"});
+        }
+    }
+
+}

web/App_Code/api/orderController.cs

@@ -1,17 +1,19 @@
-using System;
+using DocumentFormat.OpenXml.Drawing.Charts;
+using Model;
+using MyWeb;
+using Newtonsoft.Json;
+using PagedList;
+using System;
+using System.Activities.Expressions;
+using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IdentityModel.Metadata;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
-using PagedList;
-using Newtonsoft.Json;
-using System.Collections;
 using static TreeView;
-using Model;
-using System.IdentityModel.Metadata;
-using MyWeb;
-using DocumentFormat.OpenXml.Drawing.Charts;
 
 
 // api/order
@@ -206,7 +208,7 @@ public class orderController : ApiController
      string sortBy = "", bool sortDesc = false)
     {
 
-        var qry = _db.pro_order.AsQueryable();
+        var qry = _db.pro_order.Include("activity").Include("activity.activity_check").AsQueryable();
         //var aIDt = _db.actItems.AsEnumerable().Where(f => f.subject.Contains(q.actItemTxt.Trim())).Select(f => f.num);//品項
 
 
@@ -221,7 +223,10 @@ public class orderController : ApiController
         if (q.up_time1.HasValue)
             qry = qry.Where(o => o.up_time >= q.up_time1.Value);
         if (q.up_time2.HasValue)
-            qry = qry.Where(o => o.up_time < Convert.ToDateTime(q.up_time2.Value).AddDays(1));
+        {
+            var tmp_up_time2 = Convert.ToDateTime(q.up_time2.Value).AddDays(1);
+            qry = qry.Where(o => o.up_time < tmp_up_time2);
+        }
         if (!string.IsNullOrEmpty(q.address))
             qry = qry.Where(o => o.address.Contains(q.address.Trim()));
         if (!string.IsNullOrEmpty(q.subject))
@@ -291,6 +296,13 @@ public class orderController : ApiController
             else
                 qry = qry.OrderBy(o => o.activity != null ? o.activity.subject : "");
         }
+        else if(sortBy.Equals("status"))
+        {
+            if (sortDesc)
+                qry = qry.OrderByDescending(o => o.activity.activity_check.FirstOrDefault(a => o.activity_num == a.activity_num && o.f_num == a.f_num).status ?? 0);
+            else
+                qry = qry.OrderBy(o => o.activity.activity_check.FirstOrDefault(a => o.activity_num == a.activity_num && o.f_num == a.f_num).status ?? 0);
+        }
         else
             qry = qry.OrderByDescending(o => o.reg_time);
 
@@ -307,6 +319,7 @@ public class orderController : ApiController
                 keyin1 = x.keyin1,
                 up_time = x.up_time,
                 keyin1_txt = Model.pro_order.keyin1_value_to_text(x.keyin1),
+                status = x.activity.activity_check.FirstOrDefault(a => x.activity_num == a.activity_num && x.f_num == a.f_num)?.status ?? 0,
             }),
             count = count
         };
@@ -447,6 +460,7 @@ public class orderController : ApiController
                                     ? x.num.ToString()
                                     : (x.parent_num.ToString() + x.num.ToString())
                                     ),
+                                    style=x.style??""
                             //cash_record = x.pro_order_record.Select( c => new { 
                             //    c,
                             //    //pay_kind = tdesc2[c.payment.HasValue && x.keyin1.Value > 0 ? x.keyin1.Value : 1],
@@ -712,6 +726,7 @@ public class orderController : ApiController
                     order.demo = item.demo;
                     order.customize_data = item.customize_data;
                     order.UpdateTime = DateTime.Now;
+                    order.style = item.style;
                     _db.SaveChanges();
                     var ret = new
                     {
@@ -765,6 +780,7 @@ public class orderController : ApiController
                     demo = item.demo,
                     customize_data = item.customize_data,
                     UpdateTime = DateTime.Now,
+                    style=item.style
                 };
                 _db.pro_order_detail.Add(orderDetail);
                 _db.SaveChanges();

web/App_Code/api/orderdetailController.cs

@@ -1,14 +1,18 @@
-using System;
+using com.itextpdf.text.pdf;
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PagedList;
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Data.Entity;
+using System.Data.SqlClient;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
-using PagedList;
-using Newtonsoft.Json;
-using System.Collections;
 using static TreeView;
-using System.Data.Entity;
 
 /// <summary>
 /// orderdetail 的摘要说明
@@ -59,4 +63,39 @@ public class orderdetailController:ApiController
         if (ret.list == null) throw new HttpResponseException(HttpStatusCode.NotFound);
         return Ok(ret);
     }
+
+    [HttpPost]
+    [Route("api/orderdetail/GetDetailToPrint")]
+    public IHttpActionResult GetDetailToPrint([FromBody] dynamic data)
+    {
+        if (data.param is Newtonsoft.Json.Linq.JArray items)
+        {
+            string[] details = new string[items.Count];
+            int i = 0;
+            foreach (var item in items)
+            {
+                details[i] = item["order_no"] + item["num"].ToString();
+                i++;
+            }
+
+            var parameters = details.Select((s,j)=>"@p"+j).ToArray();
+            string sql = $"select *  from pro_order_detail where order_no+convert(varchar,num) in ({string.Join(",",parameters)}) ";
+   
+            int l =0;
+            List<SqlParameter> sqlList = new List<SqlParameter>();
+            foreach (var item in details)
+            {
+                sqlList.Add( new SqlParameter("@p" + l, item));
+                l++;
+            }
+            SqlParameter[] p = sqlList.ToArray();
+            var ret = _db.Database.SqlQuery<pro_order_detail>(sql, p).ToList();
+            if (ret == null) throw new HttpResponseException(HttpStatusCode.NotFound);
+            return Ok(ret);
+        }
+        else
+        {
+            throw new HttpResponseException(HttpStatusCode.NotFound);
+        }
+    }
 }

web/App_Code/api/transfer_registerController.cs

@@ -10,6 +10,7 @@ using System.Collections;
 using MyWeb;
 using System.Web.WebPages;
 using System.Data.Entity;
+using Model;
 
 [ezAuthorize]
 public class transfer_registerController : ApiController
@@ -269,6 +270,7 @@ public class transfer_registerController : ApiController
         public string check_memo { get; set; }
         public string draft { get; set; }
         public int? acc_kind { get; set; } // 新增關聯欄位
+        public int? kind { get; set; }
     }
 
     [HttpPost]
@@ -315,7 +317,7 @@ public class transfer_registerController : ApiController
                         {
                             uptime = dto.check_date,
                             category = 1, // 收入
-                            kind = 27, // 固定值：法會收入/功德項目
+                            kind = dto.kind,//27, // 固定值：法會收入/功德項目
                             kind2 = dto.acc_num,
                             price = (float)(dto.check_amount ?? 0),
                             tax = 0,
@@ -346,6 +348,7 @@ public class transfer_registerController : ApiController
                     item.check_memo = dto.check_memo;
                     item.draft = dto.draft;
                     item.acc_kind = dto.acc_kind;
+                    
                 }
             }
             _db.SaveChanges();
@@ -958,7 +961,10 @@ public class transfer_registerController : ApiController
                 activity_name = x.activity != null ? x.activity.subject : "",
                 activity_num = x.activity_num,
                 acc_name = x.acc_num != null ? _db.accounting_kind2.Where(a => a.num == x.acc_num).Select(a => a.kind).FirstOrDefault() : "",
-                
+                price_totals=_db.pro_order_detail.
+                Where(a => _db.pro_order.Where (po=>po.f_num==x.f_num&&po.activity_num==x.activity_num).
+                Select(po => po.order_no).Any(p=>p.Equals(a.order_no))).Sum(a => a.price*a.qty),
+                pay_totals=_db.transfer_register.Where(a=>a.activity_num==x.activity_num&&a.f_num==x.f_num).Sum(a=>a.check_amount),
                 // pro_order_record 資訊 (透過 transfer_id 關聯)
                 pro_order_records = x.pro_order_record.Select(pr => new {
                     pr.num,

web/App_Data/PublishProfiles/FolderProfile.pubxml

@@ -8,7 +8,7 @@
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>D:\17168web</PublishUrl>
+    <PublishUrl>C:\17168web</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <_TargetId>Folder</_TargetId>
     <SiteUrlToLaunchAfterPublish />

web/admin/Templates/TBS5ADM001/MasterPage.master

@@ -23,6 +23,8 @@
     <link href="~/js/sweetalert2/sweetalert2.min.css" rel="stylesheet" />        
 
     <link href="~/admin/Templates/TBS5ADM001/css/Style.css" rel="stylesheet" />
+    <link href="~/admin/item/css/floating.css" rel="stylesheet" />
+    <link href="~/admin/item/css/tablet-design.css" rel="stylesheet" />
     <asp:ContentPlaceHolder id="page_header" runat="server">
     </asp:ContentPlaceHolder>
 </head>
@@ -67,14 +69,14 @@
             let HTTP_HOST = "<%=UrlHost()%>";
         </script>
         <script src="<%=ResolveUrl("~/js/bootstrap5/js/bootstrap.bundle.min.js")%>"></script>
-        <script src="<%=ResolveUrl("~/js/jquery-3.6.0.min.js")%>"></script>
+        <script src="<%=ResolveUrl("~/js/jquery-4.0.0.min.js")%>"></script>
         <script src="<%=ResolveUrl("~/js/vue.min.js")%>"></script>
         <script src="<%=ResolveUrl("~/js/vuetify.min.js")%>"></script>
         <script src="<%=ResolveUrl("~/js/axios.min.js")%>"></script>
         <script src="<%=ResolveUrl("~/js/moment.min.js")%>"></script>
         <script src="<%=ResolveUrl("~/js/sweetalert2/sweetalert2.all.min.js") %>"></script>
         <script src="<%=ResolveUrl("~/admin/Templates/TBS5ADM001/js/Script.js")%>"></script>
-        
+        <script src="<%=ResolveUrl("~/admin/item/jquery-ui/jquery-ui.min.js")%>"></script>
         <script>
             //全局的VUE組件，操作提示組件
             Vue.component('message-modal', {

web/admin/Templates/TBS5ADM001/uc/menu.ascx

@@ -16,6 +16,8 @@
                         <asp:Repeater ID="Repeater2" runat="server" OnItemDataBound="Repeater2_ItemDataBound">
                         <ItemTemplate>
                             <a class="nav-link" href="<%#ResolveUrl(ValString(Eval("url"))) %>"
+                                onclick="sessionStorage.removeItem('member_list_cache'); sessionStorage.removeItem('member_query_params');
+                                            sessionStorage.removeItem('order_list_cache'); sessionStorage.removeItem('order_query_params');"
                                 target="<%#(ValString(Eval("target"))=="B"?"_blank":"_self") %>">
                                 <%#Eval("title") %></a>
                         </ItemTemplate>

web/admin/activity/index2.aspx

@@ -7,19 +7,20 @@
     <div class="mb-2 mb-sm-0">
         <ul class="nav ps-0">
             <li class="nav-item pe-3">
-                      <select class="form-select" v-model="search.kind" @change="btn_search">
+                      <select class="form-select" v-model="search.kind" @change="btn_search" :disabled="isEditing">
                                <option value="">選擇分類</option>
                                <option v-for="item in itemKindList" :value="item.num">{{item.kind}}</option>
                      </select>            
               </li>
               <li class="nav-item pe-1">
-                    <a href="item_reg.aspx" class="btn btn-primary">
+                    <a href="item_reg.aspx" class="btn btn-primary" :class="{ 'disabled': isEditing }" >
                         <i class="mdi mdi-plus"></i>新增
                     </a>
               </li>
-              <li class="nav-item pe-1">
-                    <a @click="deleteAll" class="btn btn-outline-danger" title="刪除勾選的資料" ><i class="mdi mdi-trash-can"></i> 刪除勾選</a>
-              </li>
+              
+            <li class="nav-item pe-1">
+                    <a @click="deleteAll" class="btn btn-outline-danger" title="刪除勾選的資料" :class="{ 'disabled': isEditing }" ><i class="mdi mdi-trash-can"></i> 刪除勾選</a>
+            </li>
         </ul>
     <%--  <div class="input-group mb-3" data-search-control="search1"  @click="search_show(search_dialog.controls.search1)">
                   <input class="form-control search-text" type="text" readonly
@@ -30,25 +31,30 @@
                   </button>
               </div>--%>
     </div> 
+    <div>
 
-    <div class="">
    
-        <asp:LinkButton ID="excel" runat="server"  CssClass="btn btn-outline-success" OnClick="excel_Click"><span class="fa-solid fa-file-excel"></span> 匯出Excel</asp:LinkButton>
+    <a v-if="!isEditing" @click="editClick" class="btn btn-outline-secondary" title="編輯排列順序"><i class="mdi mdi-swap-vertical"></i> 編輯排列順序</a>
+    <a v-else @click="editClick" class="btn btn-outline-secondary" title="完成編輯排列順序"><i class="mdi mdi-swap-vertical"></i> 完成編輯</a>
+    <div :style="isEditing ? 'pointer-events: none; opacity: 0.5;' : ''" style="display:inline-block;">
    
-    </div>
+        <asp:LinkButton ID="excel" runat="server"  CssClass="btn btn-outline-success" OnClick="excel_Click" ><span class="fa-solid fa-file-excel"></span> 匯出Excel</asp:LinkButton>
+
+    </div> </div>
 </asp:Content>
 <asp:Content ID="Content5" ContentPlaceHolderID="footer_script" runat="Server">
- 
+    <script src="https://cdn.jsdelivr.net/npm/sortablejs@1.14.0/Sortable.min.js"></script>
     <script>
         Vue.filter('timeString', function (value, myFormat) {
             return value == null || value == "" ? "" : moment(value).format(myFormat || 'YYYY-MM-DD, HH:mm:ss');
         });
 
-        let VueApp=new Vue({
+        let VueApp = new Vue({
             el: '#app',
             vuetify: new Vuetify(vuetify_options),
             data() {
                 return {
+                    isEditing: false,
                     options: { multiSort: false },
                     data_table: {
                         loading: true,
@@ -68,15 +74,15 @@
                             { text: '', value: 'slot_btn', sortable: false, align: 'end' },
 
                         ],
-                        footer:{
+                        footer: {
                             showFirstLastPage: true,
-                            itemsPerPageOptions:[5,10,20,30],
+                            itemsPerPageOptions: [5, 10, 20, 30],
                         },
                     },
                     search: {
                         kind: '',
                         subject: '',
-                        selltime1:'',                        
+                        selltime1: '',
                         selltime2: '',
                         uptime1: '',
                         uptime2: '',
@@ -98,7 +104,7 @@
                                     { id: 'kind', title: '品項分類', value: '' },
                                 ],
                                 selected: {},
-                                select(t,data) {
+                                select(t, data) {
                                     data.search.kind = t.num;
                                     data.btn_search()
                                     console.log("select search1", t);
@@ -120,9 +126,9 @@
                     }, snackbar: {
                         show: false,
                         text: "",
-                    }, itemKindList:{
+                    }, itemKindList: {
                         num: 0,
-                        kind:''
+                        kind: ''
                     }
                 }
             },
@@ -174,20 +180,39 @@
 
                 },
                 getDefault(clearpage = false) {
-                    const { sortBy, sortDesc, page, itemsPerPage } = this.options
-                    const params = {
-                        sortBy: sortBy[0], sortDesc: sortDesc[0],
-                        page: clearpage ? '1' :page, pageSize: itemsPerPage
-                    };
-                    this.data_table.loading = true
-                    axios
-                        .post(HTTP_HOST + 'api/activity/GetItemList', this.search, { params: params })
-                        .then(response => {
-                            this.data_table.list = response.data.list
-                            this.data_table.count = response.data.count;
-                            this.data_table.loading = false
-                        })
-                        .catch(error => console.log(error))
+                    if (this.isEditing) {
+                        const { sortBy, sortDesc, page, itemsPerPage } = this.options
+                        const params = {
+                            sortBy: "sort_order", sortDesc: sortDesc[0],
+                            page: clearpage ? '1' : page, pageSize: 0
+                        };
+                        this.data_table.loading = true
+                        axios
+                            .post(HTTP_HOST + 'api/activity/GetItemList', this.search, { params: params })
+                            .then(response => {
+                                this.data_table.list = response.data.list
+                                this.data_table.count = response.data.count;
+                                this.data_table.loading = false
+                            })
+                            .catch(error => console.log(error))
+                    }
+                    else {
+                        const { sortBy, sortDesc, page, itemsPerPage } = this.options
+                        const params = {
+                            sortBy: sortBy[0], sortDesc: sortDesc[0],
+                            page: clearpage ? '1' : page, pageSize: itemsPerPage
+                        };
+                        this.data_table.loading = true
+                        axios
+                            .post(HTTP_HOST + 'api/activity/GetItemList', this.search, { params: params })
+                            .then(response => {
+                                this.data_table.list = response.data.list
+                                this.data_table.count = response.data.count;
+                                this.data_table.loading = false
+                            })
+                            .catch(error => console.log(error))
+                    }
+
                 },
                 editItem(item) {
                     console.log("edit", item);
@@ -225,6 +250,29 @@
                             .catch(error => console.log(error))
                     }
                 },
+                editClick() {
+                    if (this.isEditing) {
+                        this.isEditing = false;
+                        const sortedIds = this.data_table.list.map(item => item.num);
+                        axios.post(HTTP_HOST + 'api/activity/SaveItemList', { ids: sortedIds })
+                            .then(response => {
+                                this.isEditing = false;
+                                this.getDefault();
+                            })
+                            .catch(error => {
+                                alert("儲存排序失敗：" + error);
+                            })
+                            .finally(() => {
+                                this.data_table.loading = false;
+                                
+                            });
+
+                    }
+                    else {
+                        this.isEditing = true;
+                        this.getDefault()
+                    }
+                },
                 btn_search() {
                     this.getDefault(true)
                 },
@@ -232,86 +280,115 @@
                     clearObjProps(this.search);
                     this.btn_search()
                 },
-              //===
-            search_show(curr) {
-                //console.log("btn_click:", curr, curr.api_url);
-                this.search_dialog.current = curr;
-                this.search_clear()
-                //this.search_get()//清除完自動會重抓, 故取消
-                this.search_dialog.show = true;
-            },
-            search_clear() {
-                if (!this.search_dialog.current.keys) return;
-                this.search_dialog.current.keys.forEach((t, i) => { t.value = '' })
-                this.search_get()
-            },
-            search_get() {
-                if (!this.search_dialog.current.keys) return;
-                let api_url = this.search_dialog.current.api_url;
-                let keys = this.search_dialog.current.keys;
-                //const { page, itemsPerPage } = this.options
-                //const { sortBy, sortDesc, page, itemsPerPage } = this.options
-                this.search_dialog.page = this.options.page ?? 1
-                let params = { page: this.search_dialog.page, pageSize: 10 };//url params
-                var search = {};//post body
-                keys.forEach((t, i) => {
-                    search[t.id] = t.value;
-                });
+                //===
+                search_show(curr) {
+                    //console.log("btn_click:", curr, curr.api_url);
+                    this.search_dialog.current = curr;
+                    this.search_clear()
+                    //this.search_get()//清除完自動會重抓, 故取消
+                    this.search_dialog.show = true;
+                },
+                search_clear() {
+                    if (!this.search_dialog.current.keys) return;
+                    this.search_dialog.current.keys.forEach((t, i) => { t.value = '' })
+                    this.search_get()
+                },
+                search_get() {
+                    if (!this.search_dialog.current.keys) return;
+                    let api_url = this.search_dialog.current.api_url;
+                    let keys = this.search_dialog.current.keys;
+                    //const { page, itemsPerPage } = this.options
+                    //const { sortBy, sortDesc, page, itemsPerPage } = this.options
+                    this.search_dialog.page = this.options.page ?? 1
+                    let params = { page: this.search_dialog.page, pageSize: 10 };//url params
+                    var search = {};//post body
+                    keys.forEach((t, i) => {
+                        search[t.id] = t.value;
+                    });
 
-                console.log("search_get", api_url, search, params, this.options);
-                this.search_dialog.loading = true
-                axios.post(api_url, search, { params: params })
-                    .then(response => {
-                        this.search_dialog.list = response.data.list
-                        this.search_dialog.count = response.data.count
-                        this.search_dialog.loading = false
+                    console.log("search_get", api_url, search, params, this.options);
+                    this.search_dialog.loading = true
+                    axios.post(api_url, search, { params: params })
+                        .then(response => {
+                            this.search_dialog.list = response.data.list
+                            this.search_dialog.count = response.data.count
+                            this.search_dialog.loading = false
+                        })
+                        .catch(error => {
+                            console.log(error)
+                            this.search_dialog.list = []
+                            this.search_dialog.count = 0
+                            this.search_dialog.loading = false
+                            this.snackbar.text = "錯誤:" + error
+                            this.snackbar.show = true
+                        })
+                },
+                search_headers() {
+                    if (!this.search_dialog.current.columns) return;
+                    r = [];
+                    this.search_dialog.current.columns.forEach((t, i) => {
+                        r.push({
+                            text: t.title,
+                            align: 'start',
+                            sortable: false,
+                            value: t.id,
+                        })
                     })
-                    .catch(error => {
-                        console.log(error)
-                        this.search_dialog.list = []
-                        this.search_dialog.count = 0
-                        this.search_dialog.loading = false
-                        this.snackbar.text = "錯誤:" + error
-                        this.snackbar.show = true
-                    })
-            },
-            search_headers() {
-                if (!this.search_dialog.current.columns) return;
-                r = [];
-                this.search_dialog.current.columns.forEach((t, i) => {
-                    r.push({
-                        text: t.title,
-                        align: 'start',
-                        sortable: false,
-                        value: t.id,
-                    })
-                })
-                return r
-            },
-            search_select(row) {
-                let curr = this.search_dialog.current;
-                let target = $(`[data-search-control=${curr.id}]`);
-                curr.selected = row;
-                target.children("input.search-text").val(curr.selected[curr.text_prop])//text
-                target.children("input:hidden").val(curr.selected[curr.value_prop])//value
-                if (curr.select instanceof Function) {
-                    curr.select(row,this);
-                }
-                this.search_dialog.show = false;
-            },
+                    return r
+                },
+                search_select(row) {
+                    let curr = this.search_dialog.current;
+                    let target = $(`[data-search-control=${curr.id}]`);
+                    curr.selected = row;
+                    target.children("input.search-text").val(curr.selected[curr.text_prop])//text
+                    target.children("input:hidden").val(curr.selected[curr.value_prop])//value
+                    if (curr.select instanceof Function) {
+                        curr.select(row, this);
+                    }
+                    this.search_dialog.show = false;
+                },
+                saveOrder(event) {
+                    const movedItem = this.data_table.list.splice(event.oldIndex, 1)[0];
+                    this.data_table.list.splice(event.newIndex, 0, movedItem);
+                },
 
             },
             computed: {
                 pageCount() {
                     return Math.ceil(this.data_table.count / this.data_table.pageSize)
                 },
+                computedHeaders() {
+                    return this.data_table.header.map(h => {
+                        if (h.value === 'slot_btn') {
+                            return { ...h, sortable: false };
+                        }
+
+                        return {
+                            ...h,
+                            sortable: this.isEditing ? false : (h.sortable !== false)
+                        };
+                    });
+                },
             },
             filters: {
                 currency: function (value) {
                     return value == null || value == "" ? "" :
                         ('$' + parseFloat(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, "$1,").replace(".00", ""));
                 },
-            }
+            },
+            directives: {
+                sortableDataTable: {
+                    bind(el, binding, vnode) {
+                        const options = {
+                            animation: 150,
+                            onUpdate: function (event) {
+                                vnode.child.$emit('sorted', event)
+                            }
+                        }
+                        Sortable.create(el.getElementsByTagName('tbody')[0], options)
+                    }
+                }
+            },
         })
     </script>   
 </asp:Content>
@@ -319,6 +396,9 @@
     <uc1:alert runat="server" ID="L_msg" Text="" />
      <div id="content" class="container-fluid">
         <v-data-table
+            v-sortable-data-table
+            @sorted="saveOrder"
+            :headers="computedHeaders"
             v-model="data_table.selected"
             :items="data_table.list"
             :search-props="search"
@@ -332,8 +412,29 @@
             show-select
             hide-default-footer
             :page.sync="data_table.page"
-            :items-per-page.sync="data_table.pageSize"
+            :items-per-page.sync= "isEditing ? -1 :data_table.pageSize"
             class="elevation-1">
+            <template v-slot:header.data-table-select="{ on, props }">
+                <v-simple-checkbox
+                    v-if="!isEditing"
+                    v-bind="props"
+                    v-on="on"
+                ></v-simple-checkbox>
+
+                <v-icon v-else small>mdi-swap-vertical</v-icon>
+            </template>
+              <template v-slot:item.data-table-select="{ item, isSelected, select }">
+                <v-simple-checkbox
+                    v-if="!isEditing"
+                    :value="isSelected"
+                    @input="select($event)"
+                ></v-simple-checkbox>
+
+                <div v-else class="handle" style="cursor: grab;">
+                    <v-icon color="grey darken-1">mdi-drag-vertical</v-icon>
+                </div>
+            </template>
+
             <template #item.price="{ item }" >
                 {{item.price  | currency  }}
             </template>
@@ -352,12 +453,12 @@
             </template> 
             
             
-            <template #item.slot_btn="{ item }">
-                <a :href="'item_reg.aspx?num='+item.num" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-pencil-box-outline"></i>修改</a>
-                <a @click="deleteItem(item)" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-trash-can"></i>刪除</a>         
+            <template #item.slot_btn="{ item }" >
+                <a  v-if="!isEditing" :href="'item_reg.aspx?num='+item.num" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-pencil-box-outline"></i>修改</a>
+                <a  v-if="!isEditing" @click="deleteItem(item)" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-trash-can"></i>刪除</a>                 
             </template>
         </v-data-table> 
-        <v-container>
+        <v-container v-if="!isEditing">
             <v-row class="align-baseline" wrap>
                 <v-col cols="12" md="9">
                     <v-pagination

web/admin/activity/index2.aspx.cs

@@ -148,7 +148,7 @@ public partial class admin_activity_index2 : MyWeb.config
             }
 
             var tdesc = publicFun.enum_desc<Model.activity.category>();
-            qry = qry.OrderByDescending(o => o.num);
+            qry = qry.OrderByDescending(o => o.sort_order);
             var list = qry.ToList();
             if (list.Count > 0)
             {

web/admin/activity/item_reg.aspx

@@ -23,6 +23,8 @@
             data() {
                 return {
                     this_id: '<%= Request["num"] %>',
+                    paperlist: [],
+                    stylelist: [],
                     options: {},
                     optionsDetail: {
                         multiSort: false,
@@ -43,7 +45,7 @@
                                     { id: 'kind', title: '分類名稱' },
                                 ],
                                 selected: {},
-                                select(item,t) {
+                                select(item, t) {
                                     console.log("select search1", t);
                                 }
                             },
@@ -60,7 +62,7 @@
                                     { id: 'subject', title: '文件名稱' },
                                 ],
                                 selected: {},
-                                select(item,t) {
+                                select(item, t) {
                                     console.log("select search2", t);
 
                                     item.files_num_selected.text = t.subject //=====?
@@ -71,26 +73,26 @@
                                 id: 'search3',
                                 title: '子項目',
                                 text_prop: 'subject',
-                                  value_prop: 'num',
-                                  keys: [
-                                      { id: 'subject', title: '項目名稱', value: '' },
-                                      { id: 'kindTxt', title: '項目分類' },
-                                  ],
-                                  api_url: HTTP_HOST + 'api/activity/GetItemList',
-                                  columns: [
-                                      { id: 'subject', title: '項目名稱', value: '' },
-                                      { id: 'kindTxt', title: '項目分類' },
-                                  ],
-                                  selected: {},
-                                  select(item,t) {
-                                      console.log("select search3", item, t);
-                                      //debugger;
-                                      item.actItem.subject = t.subject
-                                      item.actItem.num = t.num 
-                                      item.item_num_selected={
-                                          text: t.subject,
-                                          val : t.num
-                                      }
+                                value_prop: 'num',
+                                keys: [
+                                    { id: 'subject', title: '項目名稱', value: '' },
+                                    { id: 'kindTxt', title: '項目分類' },
+                                ],
+                                api_url: HTTP_HOST + 'api/activity/GetItemList',
+                                columns: [
+                                    { id: 'subject', title: '項目名稱', value: '' },
+                                    { id: 'kindTxt', title: '項目分類' },
+                                ],
+                                selected: {},
+                                select(item, t) {
+                                    console.log("select search3", item, t);
+                                    //debugger;
+                                    item.actItem.subject = t.subject
+                                    item.actItem.num = t.num
+                                    item.item_num_selected = {
+                                        text: t.subject,
+                                        val: t.num
+                                    }
                                     //   item.bom_editedItem.actItem.subject = t.subject
                                     //   item.bom_editedItem.actItem.num = t.num 
 
@@ -98,8 +100,8 @@
                                     //       text : t.subject,
                                     //       val = t.num 
                                     //   }
-                                  }
-                                  ////新增/修改+關閉時, 會清空/還原
+                                }
+                                ////新增/修改+關閉時, 會清空/還原
                             },
 
                         },
@@ -243,8 +245,8 @@
                     });
                     //necessary parameter===
                     if (this.search_dialog.current.id == 'search1') {
-                        if (this.this_id=="")
-                        search['status'] = "Y";//啟用              
+                        if (this.this_id == "")
+                            search['status'] = "Y";//啟用              
                     }
                     console.log("search_get", api_url, search, params, this.options);
                     this.search_dialog.loading = true
@@ -292,7 +294,7 @@
                     target.children("input.search-text").val(curr.selected[curr.text_prop])//text
                     target.children("input:hidden").val(curr.selected[curr.value_prop])//value
                     if (curr.select instanceof Function) {
-                        curr.select(editem,row);
+                        curr.select(editem, row);
                     }
                     this.search_dialog.show = false;
                     //console.log(row, row["u_name"], row["f_number"], curr.id, target);
@@ -334,6 +336,50 @@
                             )
                     }
 
+                    axios
+                        .post(HTTP_HOST + 'api/tablet/GetPaperSize', {})
+                        .then(response => {
+                            console.log(response);
+                            if (response.status == "200") {
+                                let data = response.data;
+                                if (data.result == "Y") {
+                                    data.data.forEach(x => {
+                                        this.paperlist.push({ name: x.paperName, id: x.paperID, width: x.width, height: x.height })
+                                        $('#<%= ddlPageSize.ClientID %>').append(`<option value="${x.paperID}">${x.paperName}</option>`);
+                                            $('#<%= ddlPrintSize.ClientID %>').append(`<option value="${x.paperID}">${x.paperName}</option>`);
+                                        });
+                                                          
+                                        $('#<%= ddlPageSize.ClientID %>').val($("#<%= hidPageSize.ClientID %>").val())
+                                        $('#<%= ddlPrintSize.ClientID %>').val($("#<%= hidPrintSize.ClientID %>").val())
+                                    }
+                                }
+                            })
+                        .catch(
+                            error => console.log(error)
+                        )
+
+                    axios
+                        .post(HTTP_HOST + 'api/tablet/GetStyleData', {})
+                        .then(response => {
+                            console.log(response);
+                            if (response.status == "200") {
+                                let data = response.data;
+                                if (data.result == "Y") {
+                                    data.data.forEach(x => {
+                                        if (x.styleID != "000001") {
+                                            this.stylelist.push({ styleID: x.styleID, name: x.name })
+                                            $('#<%= ddlDefaultStyle.ClientID %>').append(`<option value="${x.styleID}">${x.name}</option>`);
+                                                 //$("#defaultStyle").append(`<option value="${x.styleID}">${x.name}</option>`);
+                                             }
+                                         });
+                                         $('#<%= ddlDefaultStyle.ClientID %>').val($("#<%= hidDefaultStyle.ClientID %>").val())
+                                     }
+                                 }
+                             })
+                        .catch(
+                            error => console.log(error)
+                        )
+
                 },
                 editItem(item) {
                     this.editedIndex = this.desserts.indexOf(item);
@@ -404,7 +450,7 @@
                     if (this.editedIndex > -1) {
                         if (this.this_id != '') {
                             //chcck necessary params
-                            if (this.editedItem.files_num_selected.val != 0 ) {
+                            if (this.editedItem.files_num_selected.val != 0) {
                                 //insert or update data
                                 var pro_order_detail =
                                 {
@@ -443,16 +489,16 @@
                     const _subject = $('#<%= subject.ClientID%>').val();
                     return "（" + strUser + "）" + " " + _kind_txt + " " + _subject;
                 },
-                bom_editItem(item){
+                bom_editItem(item) {
                     this.bom_editedIndex = this.bom_list.indexOf(item);
                     this.bom_editedItem = $.extend(true, {}, item);
                     console.log("bom_editItem:", this.bom_editedIndex, this.bom_editedItem);
                     //debugger;
                 },
-                bom_deleteItem(item){
+                bom_deleteItem(item) {
                     confirm('確定要刪除此筆資料嗎?') && this.bom_list.splice(index, 1);
                 },
-                bom_cancel(){
+                bom_cancel() {
                     this.bom_spliceNullData();
                     this.bom_close();
                 },
@@ -472,7 +518,7 @@
                         this.bom_editedItem = -1;
                     }, 300)
                 },
-                bom_addNew(){
+                bom_addNew() {
                     this.spliceNullData();
 
                     //addObj.id = this.desserts.length + 1;
@@ -491,11 +537,11 @@
                     if (!!this.bom_list) this.bom_list?.unshift(addObj);
                     this.bom_editItem(addObj);
                 },
-                bom_save(){
+                bom_save() {
                     if (this.bom_editedIndex > -1) {
                         if (this.this_id != '') {
                             //chcck necessary params
-                            if (this.bom_editedItem.item_num_selected.val != 0 ) {
+                            if (this.bom_editedItem.item_num_selected.val != 0) {
                                 //insert or update data
                                 var package_num = $(".packageNum input[type=hidden]").val();
                                 var bom_detail =
@@ -525,6 +571,15 @@
                         }
                     }
                 },
+                changeSel(selType) {
+                    if (selType=="ddlPageSize") {
+                        $("#<%= hidPageSize.ClientID %>").val($("#<%= ddlPageSize.ClientID %>").val())
+                    } else if (selType == "ddlPrintSize") {
+                        $("#<%= hidPrintSize.ClientID %>").val($("#<%=ddlPrintSize.ClientID %>").val())
+                    } else if (selType == "ddlDefaultStyle") {
+                        $("#<%= hidDefaultStyle.ClientID %>").val($("#<%= ddlDefaultStyle.ClientID %>").val())
+                    }
+                }
             },
             computed: {
             },
@@ -625,6 +680,27 @@
                                 <asp:RegularExpressionValidator ControlToValidate="price" Display="Dynamic" SetFocusOnError="true" ErrorMessage="只能輸入數字"  ID="RegularExpressionValidator3" runat="server" ValidationExpression="^(-?\d+)(\.\d+)?$" />
                             </div>
                         </div>
+                         <div class="row mb-1 label-sm-right">
+                              <label class="col-sm-2 col-form-label">預設頁面尺寸</label>
+                             <div class="col-sm-4">
+                                 <select ID="ddlPageSize" runat="server" onchange="VueApp.changeSel('ddlPageSize')"></select>
+                                 <asp:HiddenField ID="hidPageSize" runat="server" />
+                             </div>    
+                              <label class="col-sm-2 col-form-label">預設列印尺寸</label>
+                            <div class="col-sm-4">
+                                <select ID="ddlPrintSize" runat="server"  onchange="VueApp.changeSel('ddlPrintSize')"></select>
+                                 <asp:HiddenField ID="hidPrintSize" runat="server" />
+                            </div>    
+                        </div>
+                          <div class="row mb-1 label-sm-right">
+                           <label class="col-sm-2 col-form-label">預設版型</label>
+                          <div class="col-sm-4">
+                              <select ID="ddlDefaultStyle" runat="server"  onchange="VueApp.changeSel('ddlDefaultStyle')"></select>
+                               <asp:HiddenField ID="hidDefaultStyle" runat="server" />
+                          </div>    
+                 
+                         </div>    
+                  
                         <asp:UpdatePanel ID="UpdatePanel1" runat="server" class="row mb-1 label-sm-right">
                             <ContentTemplate>
                                 <label class="col-sm-2 col-form-label"></label>

web/admin/activity/item_reg.aspx.cs

@@ -44,6 +44,21 @@ public partial class admin_activity_item_reg : MyWeb.config
                     print_init.Text = prod.print_init;
                     PARTNO.Text = prod.partno;
                     //kind.SelectedValue = prod.kind.ToString();
+                    if (!isStrNull(prod.pageSize))
+                    {
+                        ddlPageSize.Value = prod.pageSize.ToString();
+                        hidPageSize.Value = prod.pageSize.ToString();
+                    }
+                    if (!isStrNull(prod.printSize))
+                    {
+                        ddlPrintSize.Value = prod.printSize.ToString();
+                        hidPrintSize.Value = prod.printSize.ToString();
+                    }
+                    if (!isStrNull(prod.defaultStyle))
+                    {
+                        ddlDefaultStyle.Value = prod.defaultStyle.ToString();
+                        hidDefaultStyle.Value = prod.defaultStyle.ToString();
+                    }
                     if (prod.kind.HasValue)
                     {
                         kind_txt.Value = prod.actItem_kind.kind;
@@ -118,9 +133,22 @@ public partial class admin_activity_item_reg : MyWeb.config
             L_msg.Text = "";
 
             Model.actItem actItem = new Model.actItem();//新增
+            int maxSort = _db.actItems.Max(x => (int?)x.sort_order) ?? 0;
             actItem.subject = subject.Text;            
             actItem.print_init = print_init.Text;            
             actItem.partno = PARTNO.Text;
+            if (!isStrNull(ddlPageSize.Value))
+            {
+                actItem.pageSize = ddlPageSize.Value;
+            }
+            if (!isStrNull(ddlPrintSize.Value))
+            {
+                actItem.printSize = ddlPrintSize.Value;
+            }
+            if (!isStrNull(ddlDefaultStyle.Value))
+            {
+                actItem.defaultStyle = (ddlDefaultStyle.Value);
+            }
             //if (!isStrNull(kind.SelectedValue)) { actItem.kind = Val(kind.SelectedValue); } else { actItem.kind = null; }
             if (!isStrNull(category.SelectedValue)) { actItem.category = Val(category.SelectedValue); } else { actItem.category = null; }
             if (!isStrNull(kind.Value)) { actItem.kind = Val(kind.Value); } else { actItem.kind = null; }
@@ -131,6 +159,7 @@ public partial class admin_activity_item_reg : MyWeb.config
             actItem.is_reconcile = is_reconcile_item.Checked ? "Y" : "N";
             actItem.demo = demo.Text;
             actItem.customize_data = customize_data.Text;
+            actItem.sort_order = maxSort + 1;
 
             _db.actItems.Add(actItem);
             _db.SaveChanges();
@@ -168,6 +197,18 @@ public partial class admin_activity_item_reg : MyWeb.config
                 actItem.subject = subject.Text;
                 actItem.print_init = print_init.Text;
                 actItem.partno = PARTNO.Text;
+                if (!isStrNull(hidPageSize.Value))
+                {
+                    actItem.pageSize = hidPageSize.Value;
+                }
+                if (!isStrNull(hidPrintSize.Value))
+                {
+                    actItem.printSize = hidPrintSize.Value;
+                }
+                if (!isStrNull(hidDefaultStyle.Value))
+                {
+                    actItem.defaultStyle = (hidDefaultStyle.Value);
+                }
                 //if (!isStrNull(kind.SelectedValue)) { actItem.kind = Val(kind.SelectedValue); } else { actItem.kind = null; }
                 if (!isStrNull(category.SelectedValue)) { actItem.category = Val(category.SelectedValue); } else { actItem.category = null; }
                 if (!isStrNull(kind.Value)) { actItem.kind = Val(kind.Value); } else { actItem.kind = null; }
@@ -246,4 +287,16 @@ public partial class admin_activity_item_reg : MyWeb.config
             }
         }
     }
+
+    //protected override void Render(HtmlTextWriter writer)
+    //{
+    //    ClientScript.RegisterForEventValidation(
+    //        ddlDefaultStyle.UniqueID, "ddlDefaultStyle");
+    //    ClientScript.RegisterForEventValidation(
+    //      ddlPageSize.UniqueID, "ddlPageSize");
+    //    ClientScript.RegisterForEventValidation(
+    //      ddlPrintSize.UniqueID, "ddlPrintSize");
+
+    //    base.Render(writer);
+    //}
 }

web/admin/activity/kind_reg.aspx

@@ -10,6 +10,7 @@
               el: '#app',
               vuetify: new Vuetify(vuetify_options),
               data() {
+                  console.log("yes",<%= _this_id %>);
                   return {
                       this_id: '<%= _this_id %>',
                       options: {},
@@ -124,6 +125,9 @@
                       deep: true,
                   },
               },
+              created() {
+                  //this.initialize();
+              },
               methods: {
                   search_show(curr) {
                       //console.log("btn_click:", curr, curr.api_url);

web/admin/activity/reg.aspx

@@ -590,7 +590,8 @@
                                   this.data_table.selected.push(this.data_table.editFilesItem[i])
                           }
                       }
-                  }, multiPrint() {
+                  },
+                  multiPrintNew() {
                       var params = {
                           item: this.thisItemSelected.val,
                           file: this.thisFilesSelected.val,
@@ -601,8 +602,81 @@
                       //list = this.data_table.selected.map(x => x.num);
 
                       list = this.data_table.selected
-                        .sort((a, b) => a.print_id.localeCompare(b.print_id))
-                        .map(x => x.num);
+                          .sort((a, b) => (a.print_id == null ? "" : a.print_id).localeCompare(b.print_id == null ? "" : b.print_id))
+                          .map(x => x.num);
+
+                      //console.log("what:",list);
+
+                      if (list.length > 0) {
+                          // 記錄已列印
+                          let _url = HTTP_HOST + 'api/order/printMultiFileLog';
+                          axios.post(_url, list, { params: params })
+                              .then(response => {
+                                  for (let i = 0; i < this.data_table.selected.length; i++) {
+                                      for (let j = 0; i < this.data_table.editFilesItem.length; j++) {
+                                          if (this.data_table.selected[i].num == this.data_table.editFilesItem[j].num) {
+                                              this.data_table.editFilesItem[j].isPrinted = true;
+                                              break;
+                                          }
+                                      }
+                                  }
+                              })
+                              .catch(error => {
+                                  console.log(error)
+
+                              })
+                          // 送出列印
+                          _url = HTTP_HOST + 'admin/print/print_multi_new.aspx';
+                          var form = document.createElement("form");
+                          form.method = "POST";
+                          form.action = _url;
+                          form.target = "_blank"; // Open the result in a new tab
+
+                          // Helper function to add hidden fields
+                          const addHiddenField = (name, value) => {
+                              const hiddenField = document.createElement("input");
+                              hiddenField.type = "hidden";
+                              hiddenField.name = name;
+                              hiddenField.value = value;
+                              form.appendChild(hiddenField);
+                          };
+
+                          // Add form fields
+                          console.log(this.thisItemSelected.val, this.thisFilesSelected.val, JSON.stringify(list));
+                          addHiddenField("item", this.thisItemSelected.val);
+                          addHiddenField("file", this.thisFilesSelected.val);
+                          addHiddenField("list", JSON.stringify(list));
+                          addHiddenField("title", `${this.thisItemSelected.text} / ${this.thisFilesSelected.text}`);
+                          //console.log("底家:",this.data_table.selected);
+                          localStorage.setItem("item", this.thisItemSelected.val);
+                          localStorage.setItem("list", JSON.stringify(this.data_table.selected));
+
+                         
+
+                          document.body.appendChild(form); // Not entirely sure if this is necessary
+                          form.submit();
+                          document.body.removeChild(form);
+                      }
+                      else {
+                          this.snackbar.text = "未選擇列印項目";
+                          this.snackbar.show = true
+                      }
+                  },
+                  multiPrint() {
+                      var params = {
+                          item: this.thisItemSelected.val,
+                          file: this.thisFilesSelected.val,
+                          //list: this.data_table.selected.map(x => x.num)
+                      };
+
+                      var list = [];
+                      //list = this.data_table.selected.map(x => x.num);
+
+                      list = this.data_table.selected
+                        .sort((a, b) => (a.print_id==null?"":a.print_id).localeCompare(b.print_id==null?"":b.print_id))
+                          .map(x => x.num);
+
+                      //console.log("what:",list);
 
                       if (list.length > 0) {                           
                             // 記錄已列印
@@ -638,11 +712,15 @@
                                 form.appendChild(hiddenField);
                             };
 
-                            // Add form fields
+                          // Add form fields
+                          console.log(this.thisItemSelected.val, this.thisFilesSelected.val,JSON.stringify(list));
                             addHiddenField("item", this.thisItemSelected.val);
                             addHiddenField("file", this.thisFilesSelected.val);
                             addHiddenField("list", JSON.stringify(list));
-                            addHiddenField("title", `${this.thisItemSelected.text} / ${this.thisFilesSelected.text}`);
+                          addHiddenField("title", `${this.thisItemSelected.text} / ${this.thisFilesSelected.text}`);
+                          //console.log("底家:",this.data_table.selected);
+                          localStorage.setItem("item", this.thisItemSelected.val);
+                          localStorage.setItem("list", JSON.stringify(this.data_table.selected));
                          
                             /*
                             var hiddenField = document.createElement("input");
@@ -827,7 +905,7 @@
     <div class="">  
         <asp:Button ID="add" runat="server" Text="送出" OnClick="add_Click" CssClass="btn btn-primary" />
         <asp:Button ID="edit" runat="server" Text="修改" Visible="false" OnClick="edit_Click" CssClass="btn btn-primary" />
-        <asp:Button ID="goback" runat="server" Text="回列表" Visible="false" CausesValidation="false" OnClick="goback_Click" CssClass="btn btn-outline-secondary" />
+        <asp:Button ID="goback" runat="server" Text="取消" Visible="true" CausesValidation="false" OnClick="goback_Click" CssClass="btn btn-outline-secondary" />
     </div>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
@@ -1199,6 +1277,12 @@
                                   @click="multiPrint">
                                   列印<v-icon dark>mdi-turn-right</v-icon>
                               </v-btn>
+                              <v-btn
+                                color="primary"
+                                class="ml-2 white--text"                             
+                                @click="multiPrintNew">
+                                列印(New)<v-icon dark>mdi-turn-right</v-icon>
+                            </v-btn>
                           </div>
                        </v-toolbar>
                        </template>    

web/admin/bill/index.aspx

@@ -0,0 +1,822 @@
+<%@ Page Title="匯款/沖帳管" Language="C#" MasterPageFile="~/admin/Templates/TBS5ADM001/MasterPage.master" AutoEventWireup="true" CodeFile="index.aspx.cs" Inherits="admin_bill_index" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="page_header" Runat="Server">
+        <link rel="stylesheet" href="../../js/_bootstrap-icons-1.8.1/bootstrap-icons.css">
+    <style>
+        .function-icon {
+            font-size: 2em;
+            line-height: 1;
+            align-content: center;
+        }
+        .external-link-icon {
+            font-size: 0.8em;
+        }
+    </style>
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="page_nav" Runat="Server">
+      <h2 class="mb-3">匯款/沖帳管理</h2>
+</asp:Content>
+<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+          <div id="content" class="container py-4">
+    <div class="row">
+        <!-- 第一欄：匯款登錄與核對 -->
+        <div class="col-lg-4 mb-4">
+            <h5 class="text-primary mb-3">
+                <i class="bi bi-upload"></i> 匯款登錄與核對
+            </h5>
+            <div class="list-group">
+                 <a href="register.aspx" class="list-group-item list-group-item-action" target="_blank">
+                     <div class="d-flex justify-content-between align-items-start">
+                         <div class="d-flex">
+                             <i class="bi bi-plus-circle text-success me-3 function-icon"></i>
+                             <div>
+                                 <div>
+                                     登錄匯款資料
+                                     <i class="bi bi-box-arrow-up-right text-muted ms-1 external-link-icon"></i>
+                                 </div>
+                                 <small class="text-muted">報名者自行填寫匯款相關資訊</small>
+                             </div>
+                         </div>
+                         <span class="badge bg-primary">報名者</span>
+                     </div>
+                 </a>
+                 <a href="verify.aspx" class="list-group-item list-group-item-action d-none">
+                     <div class="d-flex justify-content-between align-items-start">
+                         <div class="d-flex">
+                             <i class="bi bi-person-check text-info me-3 function-icon"></i>
+                             <div>
+                                 <div>出納核對匯款人</div>
+                                 <small class="text-muted">核對匯款人身份與報名資料</small>
+                             </div>
+                         </div>
+                         <span class="badge bg-info">出納</span>
+                     </div>
+                 </a>
+                                      <a href="verify1.aspx" class="list-group-item list-group-item-action">
+                     <div class="d-flex justify-content-between align-items-start">
+                         <div class="d-flex">
+                             <i class="bi bi-person-check text-info me-3 function-icon"></i>
+                             <div>
+                                 <div>出納核對匯款人（階段1）</div>
+                                 <small class="text-muted">初步核對匯款人身份資料</small>
+                             </div>
+                         </div>
+                         <span class="badge bg-info">出納</span>
+                     </div>
+                 </a>
+                 <a href="verify2.aspx" class="list-group-item list-group-item-action">
+                     <div class="d-flex justify-content-between align-items-start">
+                         <div class="d-flex">
+                             <i class="bi bi-currency-dollar text-warning me-3 function-icon"></i>
+                             <div>
+                                 <div>出納核對金額（階段2）</div>
+                                 <small class="text-muted">核對匯款金額與入帳資料</small>
+                             </div>
+                         </div>
+                         <span class="badge bg-warning text-dark">出納</span>
+                     </div>
+                 </a>
+            </div>
+        </div>
+
+        <!-- 第二欄：沖帳流程 -->
+        <div class="col-lg-4 mb-4">
+            <h5 class="text-primary mb-3">
+                <i class="bi bi-receipt"></i> 沖帳流程
+            </h5>
+            <div class="list-group">
+                <a href="personal_reconcile.aspx" class="list-group-item list-group-item-action">
+                    <div class="d-flex justify-content-between align-items-start">
+                        <div class="d-flex">
+                                                             <i class="bi bi-person text-primary me-3 function-icon"></i>
+                            <div>
+                                <div>個人-沖帳流程</div>
+                                <small class="text-muted">處理個人匯款的沖帳作業</small>
+                            </div>
+                        </div>
+                        <span class="badge bg-success">會計</span>
+                    </div>
+                </a>
+                <a href="group_reconcile.aspx" class="list-group-item list-group-item-action">
+                    <div class="d-flex justify-content-between align-items-start">
+                        <div class="d-flex">
+                                                             <i class="bi bi-people text-success me-3 function-icon"></i>
+                            <div>
+                                <div>共同-沖帳流程</div>
+                                <small class="text-muted">處理多人共同支付的沖帳作業</small>
+                            </div>
+                        </div>
+                        <span class="badge bg-success">會計</span>
+                    </div>
+                </a>
+                <a href="balance_reconcile.aspx" class="list-group-item list-group-item-action">
+                    <div class="d-flex justify-content-between align-items-start">
+                        <div class="d-flex">
+                            <i class="bi bi-calculator text-danger me-3 function-icon"></i>
+                            <div>
+                                <div>餘額核銷</div>
+                                <small class="text-muted">處理沖帳後剩餘金額的核銷</small>
+                            </div>
+                        </div>
+                        <span class="badge bg-danger">會計</span>
+                    </div>
+                </a>
+            </div>
+        </div>
+
+        <!-- 第三欄：查詢功能 -->
+        <div class="col-lg-4 mb-4">
+            <h5 class="text-primary mb-3">
+                <i class="bi bi-search"></i> 查詢功能
+            </h5>
+            <div class="list-group">
+                <a href="verify_order_record_query.aspx" class="list-group-item list-group-item-action">
+                    <div class="d-flex justify-content-between align-items-start">
+                        <div class="d-flex">
+                                                             <i class="bi bi-journal-check text-info me-3 function-icon"></i>
+                            <div>
+                                <div>沖帳查詢</div>
+                                <small class="text-muted">查詢所有沖帳記錄與明細</small>
+                            </div>
+                        </div>
+                        <span class="badge bg-info">會計</span>
+                    </div>
+                </a>                
+                <a href="balance_reconcile_query.aspx" class="list-group-item list-group-item-action">
+                    <div class="d-flex justify-content-between align-items-start">
+                        <div class="d-flex">
+                                                             <i class="bi bi-file-text text-secondary me-3 function-icon"></i>
+                            <div>
+                                <div>餘額核銷查詢</div>
+                                <small class="text-muted">查詢已完成的餘額核銷記錄</small>
+                            </div>
+                        </div>
+                        <span class="badge bg-secondary">會計</span>
+                    </div>
+                </a>
+            </div>
+        </div>
+    </div>
+
+    <!-- 統計資訊 -->
+    <div class="row mt-4">
+        <div class="col-12">
+            <div class="alert alert-info">
+                <h6 class="alert-heading">
+                    <i class="bi bi-info-circle"></i> 系統說明
+                </h6>
+                <ul class="mb-0">
+                    <li><strong>匯款登錄與核對</strong>：處理報名者匯款資料的登錄與出納核對作業</li>
+                    <li><strong>沖帳流程</strong>：處理個人與共同支付的沖帳作業，以及剩餘金額的核銷</li>
+                    <li><strong>查詢功能</strong>：提供各類沖帳記錄的查詢與統計功能</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
+
+    <keep-alive>
+    <component
+        :is="currentView" :form-data="$data">
+
+    </component>
+</keep-alive>  
+</asp:Content>
+<asp:Content ID="Content4" ContentPlaceHolderID="offCanvasRight" Runat="Server">
+</asp:Content>
+<asp:Content ID="Content5" ContentPlaceHolderID="footer_script" Runat="Server">
+    <script>
+        Vue.component('step-one', {
+
+            template: document.getElementById("content"),
+            props: ['formData'],
+            data() {
+                return {
+                    this_act: '<%= Request["act_id"]%>',
+             options: { multiSort: false },
+             search_options: { multiSort: false },
+
+             data_table: {
+                 loading: true,
+                 list: [],
+                 selected: [],
+                 singleSelect: false,
+                 count: 0,
+                 page: 1,
+                 pageSize: 10,
+                 header: [
+                     { text: '活動分類', value: 'kindsTxt' },
+                     { text: '活動名稱', value: 'subject' },
+                     { text: '開始日期', value: 'startDate_solar' },
+                     { text: '結束日期', value: 'endDate_solar', align: 'start' },
+                     { text: '報名人數', value: 'orderCounts' },
+                     { text: '', value: 'slot_btn', sortable: false, align: 'end' }
+                 ],
+                 footer: {
+                     showFirstLastPage: true,
+                     itemsPerPageOptions: [5, 10, 20, 30],
+                 },
+             },
+             //列印管理報表
+             print_conditions: 'yy',
+             print_search: {
+                 year: '',
+                 month: '',
+                 season: '',
+                 chk_hasact: false,
+                 chk_noact: false,
+                 select_act: '',
+                 select_actitem: '',
+
+             },
+             select_act_list: [],
+             select_items: {
+                 month: [{
+                     text: "請選擇",
+                     val: 0
+                 },],
+                 season: [{
+                     text: "請選擇",
+                     val: 0
+                 },],
+             },
+             print_dialog: {
+                 show: false,
+             },
+             search_dialog: {
+                 controls: {
+                     search1: {
+                         id: 'search1',
+                         title: '國籍',
+                         text_prop: 'name_zh',
+                         value_prop: 'id',
+                         keys: [
+                             { id: 'keyword', title: '關鍵字' },
+                         ],
+                         api_url: HTTP_HOST + 'api/country/GetList',
+                         columns: [
+                             { id: 'id', title: '代碼' },
+                             { id: 'name_en', title: '英文短名稱' },
+                             { id: 'name_zh', title: '中文名稱' },
+                         ],
+                         selected: {},
+                         select(item, t) {
+                             //console.log("select search1", t);
+                             t.search.country = item.id;
+                             t.search.country2 = '';
+                         }
+                     },
+                     search2: {
+                         id: 'search2',
+                         title: '報名活動',
+                         text_prop: 'subject',
+                         value_prop: 'num',
+                         keys: [
+                             { id: 'subject', title: '活動名稱', value: '' },
+                             { id: 'kindTxt', title: '活動分類' },
+                         ],
+                         api_url: HTTP_HOST + 'api/activity/GetList',
+                         columns: [
+                             { id: 'subject', title: '活動名稱' },
+                             { id: 'kindTxt', title: '活動分類' },
+                         ],
+                         selected: {},
+                         select(item, t) {
+                             t.print_search.select_act = item.num;
+                         }
+                     },
+                     search3: {
+                         id: 'search3',
+                         title: '活動品項',
+                         text_prop: 'subject',
+                         value_prop: 'num',
+                         keys: [
+                             { id: 'subject', title: '項目名稱', value: '' },
+                             { id: 'kindTxt', title: '項目分類' },
+                             { id: 'num', visible: false },
+                         ],
+                         api_url: HTTP_HOST + 'api/activity/GetOrderList',
+                         columns: [
+                             { id: 'subject', title: '項目名稱' },
+                             { id: 'kindTxt', title: '項目分類' },
+                         ],
+                         selected: {},
+                         select(item, t) {
+                             t.print_search.select_actitem = item.num;
+                         }
+                     }
+
+                 }, show: false,
+                 current: {},
+                 list: [],
+                 count: 0,
+                 page: 1,
+                 loading: false,
+                 footer: {
+                     showFirstLastPage: true,
+                     disableItemsPerPage: true,
+                     itemsPerPageAllText: '',
+                     itemsPerPageText: '',
+                 },
+             },
+             search: {
+                 keyin1: '',
+                 order_no: '',
+                 subject: '',
+                 u_name: '',
+                 up_time1: '',
+                 up_time2: '',
+                 actItemTxt: '',
+                 introducerTxt: '',
+                 activity_num: '',
+                 country: '',
+                 country2: '',
+                 hasPrice: '',
+             }
+             //報到
+             , check_dialog: {
+                 show: false,
+             },
+             check_data: {
+                 f_num: 0,
+                 u_name: '',
+                 activity_num: 0,
+                 activity_name: '',
+                 qty: 1,
+                 status: {
+                     text: '',
+                     val: 1
+                 },
+             },
+             keyin1_items: [//狀態
+                 //{ 
+                 //text: "請選擇",
+                 //val: 0
+                 //},
+             ],
+         };
+     },
+     mounted() {
+         this.detalKeyinArray();
+         this.search_dialog.current = this.search_dialog.controls.search1 ///default
+         if (this.this_act != '')
+             this.search.activity_num = this.this_act;
+         //this.initPrintSearch();
+         //this.initActivity();
+         const navEntries = performance.getEntriesByType("navigation");
+         const isReload = navEntries.length > 0 && navEntries[0].type === "reload";
+         if (isReload) {
+             sessionStorage.removeItem("orderpage");
+         }
+         else {
+             const savedPage = parseInt(sessionStorage.getItem('orderpage'));
+             if (savedPage) {
+                 this.options.page = savedPage;
+             }
+         }
+     },
+     watch: {
+         options: {
+             handler() {
+                 this.getDefault()
+             },
+             deep: true,
+         },
+         search_options: {
+             handler() {
+                 this.search_get()
+             },
+             deep: true,
+         },
+     },
+     methods: {
+         search_show(curr) {
+             //console.log("btn_click:", curr, curr.api_url);
+             this.search_dialog.current = curr;
+             this.search_clear()
+             //this.search_get()//清除完自動會重抓, 故取消
+             this.search_dialog.show = true;
+         },
+         search_clear() {
+             if (!this.search_dialog.current.keys) return;
+             this.search_dialog.current.keys.forEach((t, i) => { t.value = '' })
+             this.search_get()
+         },
+         search_get() {
+             if (!this.search_dialog.current.keys) return;
+             let api_url = this.search_dialog.current.api_url;
+             let keys = this.search_dialog.current.keys;
+             //const { page, itemsPerPage } = this.options
+             //const { sortBy, sortDesc, page, itemsPerPage } = this.options
+             this.search_dialog.page = this.search_options.page ?? 1
+             let params = { page: this.search_dialog.page, pageSize: 10 };//url params
+             var search = {};//post body
+             keys.forEach((t, i) => {
+                 search[t.id] = t.value;
+             });
+             //necessary parameter===
+             if (this.search_dialog.current.id == 'search2') {
+                 params = { sortBy: 'startDate_solar', sortDesc: true, page: this.search_dialog.page, pageSize: 10 };//url params
+             }
+
+             console.log("search_get", api_url, search, params, this.search_options);
+             this.search_dialog.loading = true
+             axios.post(api_url, search, { params: params })
+                 .then(response => {
+                     this.search_dialog.list = response.data.list
+                     this.search_dialog.count = response.data.count
+                     this.search_dialog.loading = false
+                 })
+                 .catch(error => {
+                     console.log(error)
+                     this.search_dialog.list = []
+                     this.search_dialog.count = 0
+                     this.search_dialog.loading = false
+                     this.snackbar.text = "錯誤:" + error
+                     this.snackbar.show = true
+                 })
+         },
+         search_headers() {
+             if (!this.search_dialog.current.columns) return;
+             r = [];
+             this.search_dialog.current.columns.forEach((t, i) => {
+                 r.push({
+                     text: t.title,
+                     align: 'start',
+                     sortable: false,
+                     value: t.id,
+                 })
+             })
+             return r
+         },
+         search_select(row) {
+             let curr = this.search_dialog.current;
+             let target = $(`[data-search-control=${curr.id}]`);
+             curr.selected = row;
+             target.children("input.search-text").val(curr.selected[curr.text_prop])//text
+             target.children("input:hidden").val(curr.selected[curr.value_prop])//value
+             if (curr.select instanceof Function) {
+                 curr.select(row, this);
+             }
+             this.search_dialog.show = false;
+             //console.log(row, row["u_name"], row["f_number"], curr.id, target);
+         },
+         getDetail(clearpage = false) {
+             console.log("test");
+             const { sortBy, sortDesc, page, itemsPerPage } = this.options
+             const params = {
+                 sortBy: sortBy[0], sortDesc: sortDesc[0],
+                 page: clearpage ? '1' : page, pageSize: itemsPerPage
+             };
+             this.detail_table.loading = true
+             sessionStorage.setItem('orderpage', clearpage ? '1' : page);
+             axios
+                 //.post(HTTP_HOST + 'api/order/GetList', this.search, { params: params })
+                 .post(HTTP_HOST + 'api/order/GetList', this.search, { params: params })
+                 .then(response => {
+                     this.detail_table.list = response.data.list
+                     this.detail_table.count = response.data.count;
+                     this.detail_table.loading = false
+                 })
+                 .catch(error => console.log(error))
+         },
+         getDefault(clearpage = false) {
+             const { sortBy, sortDesc, page, itemsPerPage } = this.options
+             const params = {
+                 sortBy: sortBy[0], sortDesc: sortDesc[0],
+                 page: clearpage ? '1' : page, pageSize: itemsPerPage
+             };
+             this.data_table.loading = true
+             sessionStorage.setItem('orderpage', clearpage ? '1' : page);
+             axios
+                 //.post(HTTP_HOST + 'api/order/GetList', this.search, { params: params })
+                 .post(HTTP_HOST + 'api/activity/GetList', this.search, { params: params })
+                 .then(response => {
+                     this.data_table.list = response.data.list
+                     this.data_table.count = response.data.count;
+                     this.data_table.loading = false
+                 })
+                 .catch(error => console.log(error))
+         },
+         detalKeyinArray() {
+              var getArray = <%=Newtonsoft.Json.JsonConvert.SerializeObject(_keyin1Item, Newtonsoft.Json.Formatting.Indented) %>;
+              var keys = Object.keys(getArray);
+              for (let i = 0; i < keys.length; i++) {
+                  //console.log(`${keys[i]}:${getArray[keys[i]]}`); //value : text
+                  var _tmp = {
+                      text: getArray[keys[i]],
+                      val: parseInt(keys[i]),
+                  }
+                  this.keyin1_items.push(_tmp);
+              }
+
+          },
+          editItem(item) {
+              console.log("edit", item);
+          },
+          deleteItem(item) {
+              if (confirm('是否確定刪除此筆資料?')) {
+                  const index = this.data_table.list.indexOf(item)
+                  if (index != -1) {
+                      axios
+                          .delete(HTTP_HOST + 'api/order/' + item.order_no)
+                          .then(response => {
+                              console.log("del", item);
+                              this.data_table.list.splice(index, 1);
+                              this.data_table.count = this.data_table.list.length
+                          })
+                          .catch(error => console.log(error))
+                  }
+              }
+          },
+          deleteAll() {
+              if (confirm('是否確定刪除已勾選的資料?')) {
+                  axios
+                      .delete(HTTP_HOST + 'api/order/DeleteAll/' + this.data_table.selected.map(x => x.order_no))
+                      .then(response => {
+                          //console.log("delAll");
+
+                          //for (var i = 0; i < this.data_table.selected.length; i++) {
+                          //    const index = this.data_table.list.indexOf(this.data_table.selected[i]);
+                          //    this.data_table.list.splice(index, 1);
+                          //}
+                          //this.data_table.selected = [];
+                          //this.data_table.count = this.data_table.list.length
+                          location.reload();
+                      })
+                      .catch(error => console.log(error))
+              }
+          },
+          btn_search() {
+              this.this_act = '';
+              this.search.activity_num = '';
+
+              this.getDefault(true)
+          },
+          btn_all() {
+              this.this_act = '';
+              this.search.activity_num = '';
+              clearObjProps(this.search);
+              this.btn_search()
+          },
+          checkInMsg(item) {
+              this.check_data.f_num = item.f_num;
+              this.check_data.u_name = item.u_name;
+              this.check_data.activity_num = item.activity_num;
+              this.check_data.activity_name = item.subject;
+              this.check_dialog.show = true;
+          },
+          checkIn() {
+              if (this.check_data.qty > 0 && this.check_data.status.val > 0) {
+                  var chechdata =
+                  {
+                      f_num: this.check_data.f_num,
+                      activity_num: this.check_data.activity_num,
+                      status: this.check_data.status.val,
+                      qty: this.check_data.qty,
+                  }
+                  axios
+                      .post(HTTP_HOST + 'api/activity/OrderCheckIn', chechdata)
+                      .then(response => {
+                          //清空
+                          this.check_data.f_num = 0;
+                          this.check_data.u_name = '';
+                          this.check_data.activity_num = 0;
+                          this.check_data.activity_name = '';
+                          this.check_data.qty = 1;
+                          this.check_data.status.text = '';
+                          this.check_data.status.val = 1;
+
+                          this.check_dialog.show = false;
+                          msgtop('簽到成功')
+                      })
+                      .catch(
+                          error => {
+                              console.log(error)
+                              msgtop('簽到失敗', 'error')
+                          }
+                      )
+              } else {
+                  msgbox('報到資訊請填寫完整');
+              }
+          }, goPrint() {
+              let _qry = "";
+              Object.keys(this.search).forEach(key => {
+                  //console.log(`${key}: ${this.search[key]}`);
+                  if (this.search[key] != undefined && this.search[key] != null && this.search[key] != '') {
+                      _qry += (_qry != '' ? '&' : '?') + (key + '=' + this.search[key]);
+                  }
+              });
+              window.open("print.aspx" + _qry, '_blank');
+          },
+          countryChange() {
+              this.search.country = '';
+              $('#country_txt').val('')
+          },
+          //列印管理報表
+          print_close() {
+              this.print_dialog.show = false;
+          }
+          ,
+          initPrintSearch() {
+              //下拉選單
+              for (let i = 1; i <= 12; i++) {
+                  var _tmp = {
+                      text: i,
+                      val: i,
+                  }
+                  this.select_items.month.push(_tmp);
+              }
+              for (let i = 1; i <= 4; i++) {
+                  var _tmp = {
+                      text: i,
+                      val: i,
+                  }
+                  this.select_items.season.push(_tmp);
+              }
+
+              //預設值
+              const Today = new Date();//現在日期時間
+              const first_date = new Date(Today.getFullYear(), Today.getMonth(), 1); //本月第一天
+              const last_month_date = new Date(first_date - 1); //上個月最後一天
+
+              this.print_search.year = last_month_date.getFullYear();
+              this.print_search.month = last_month_date.getMonth() + 1 //預設上個月的年份
+
+              let _season = 1;
+              const _month = first_date.getMonth() + 1; //本月
+              if (_month >= 1 && _month <= 3) {
+                  _season = 4;
+              } else if (_month >= 4 && _month <= 6) {
+                  _season = 1;
+              } else if (_month >= 7 && _month <= 9) {
+                  _season = 2;
+              } else if (_month >= 10 && _month <= 12) {
+                  _season = 3;
+              }
+              this.print_search.season = _season; //預設上一季
+
+          },
+          goPrint2() {
+              if (this.print_search.year != '') {
+                  if (this.print_search.chk_noact || this.print_search.chk_hasact) {
+                      let _qry = "";
+                      Object.keys(this.print_search).forEach(key => {
+                          if (this.print_search[key] != undefined && this.print_search[key] != null && this.print_search[key] != '') {
+                              if (key == 'month') {
+                                  if (this.print_conditions == 'mm') {
+                                      _qry += "&month=" + this.print_search.month;
+                                  }
+                              } else if (key == 'season') {
+                                  if (this.print_conditions == 'ss') {
+                                      _qry += "&season=" + this.print_search.season;
+                                  }
+                              }
+                              else {
+                                  _qry += (_qry != '' ? '&' : '?') + (key + '=' + this.print_search[key]);
+                              }
+                          }
+                      });
+
+                      this.print_dialog.show = false;
+                      window.open("print.aspx" + _qry, '_blank');
+                  } else {
+                      msgbox('活動/非活動至少勾選一項');
+                  }
+
+
+              } else {
+                  msgbox('請輸入年份');
+              }
+
+          }, chk_hasact_change() {
+              if (!this.print_search.chk_hasact) {
+                  //$('#activity_num_txt').val('')
+                  //this.print_search.select_act = '';
+                  this.clear_select_act();
+                  $('#activity_num_txt').attr("placeholder", "可選擇單一活動(需先勾選活動報名)");
+              } else {
+                  $('#activity_num_txt').attr("placeholder", "可選擇單一活動");
+              }
+
+          },
+          clear_select_act() {
+              $('#activity_num_txt').val('')
+              this.print_search.select_act = '';
+          }, clear_select_actitem() {
+              $('#actItem_num_txt').val('')
+              this.print_search.select_actitem = '';
+          },
+          initActivity() {
+              axios.get(HTTP_HOST + 'api/activity')
+                  .then(response => {
+                      this.select_act_list = response.data
+                  })
+                  .catch(error => {
+                      console.log(error)
+                  })
+          }
+      },
+      computed: {
+          pageCount() {
+              return Math.ceil(this.data_table.count / this.data_table.pageSize)
+          },
+      }
+
+  });
+
+
+        let VueApp = new Vue({
+            el: '#app',
+            vuetify: new Vuetify(),
+            data() {
+                return {
+                    currentView: 'step-one',
+                    selected_act: '',
+                    selected_order: '',
+                };
+            }, activated() {
+                console.log("yes ,go go");
+                this.getDetail();
+            },
+            data() {
+                return {
+                    options: { multiSort: false },
+                    search_options: { multiSort: false },
+                    sign_table: {
+                        loading: true,
+                        list: [],
+                        selected: [],
+                        singleSelect: false,
+                        count: 0,
+                        page: 1,
+                        pageSize: 10,
+                        header: [
+                            { text: '單號', value: 'order_no' },
+                            { text: '姓名', value: 'u_name' },
+                            { text: '報名日期', value: 'up_time' },
+                            { text: '單據狀態', value: 'keyin1_txt', align: 'start' },
+                            { text: '', value: 'slot_btn', sortable: false, align: 'end' }
+                        ],
+                        footer: {
+                            showFirstLastPage: true,
+                            itemsPerPageOptions: [5, 10, 20, 30],
+                        },
+                    },
+                    search: {
+                        keyin1: '',
+                        order_no: '',
+                        subject: '',
+                        u_name: '',
+                        up_time1: '',
+                        up_time2: '',
+                        actItemTxt: '',
+                        introducerTxt: '',
+                        activity_num: '',
+                        country: '',
+                        country2: '',
+                        hasPrice: '',
+                    }
+                };
+            },
+            watch: {
+                options: {
+                    handler() {
+                        this.getDetail()
+                    },
+                    deep: true,
+                },
+
+            },
+            methods: {
+                getDetail() {
+                    const { sortBy, sortDesc, page, itemsPerPage } = this.options
+                    const params = {
+                        //sortBy: sortBy == undefined ? "order_no" : sortBy[0],
+                        //sortDesc: sortDesc == undefined ? "" : sortDesc[0],
+                        //page: clearpage ? '1' : page, pageSize: itemsPerPage,
+                        page: '1', pageSize: 10,
+
+                    };
+                    this.search = { activity_num: this.$root.selected_act }
+                    this.detail_table.loading = true
+                    sessionStorage.setItem('orderpage', '1');// clearpage ? '1' : page
+                    axios
+                        .post(HTTP_HOST + 'api/order/GetList', this.search, { params: params })
+                        .then(response => {
+                            this.detail_table.list = response.data.list
+                            this.detail_table.count = response.data.count;
+                            this.detail_table.loading = false
+                        })
+                        .catch(error => console.log(error))
+                },
+            },
+            computed: {
+                pageCount() {
+                    return Math.ceil(this.detail_table.count / this.detail_table.pageSize)
+                },
+            }
+        });
+    </script>
+</asp:Content>
+

web/admin/bill/index.aspx.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+public partial class admin_bill_index : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+}

web/admin/follower/index.aspx

@@ -13,10 +13,12 @@
         <a @click="print_dialog.show=true" class="btn btn-outline-primary btn-print" target="_blank">
             <i class="mdi mdi-printer"></i>列印管理報表
         </a>
-        <a @click="goPrint" class="btn btn-outline-primary btn-print" target="_blank">
+        <a @click="goPrint" class="btn btn-outline-primary btn-print" :class="{ 'disabled': data_table.list.length === 0 }" target="_blank">
             <i class="mdi mdi-printer"></i>列印查詢資料
         </a>
-        <asp:LinkButton ID="excel" runat="server"  CssClass="btn btn-outline-success" OnClick="excel_Click"><span class="fa-solid fa-file-excel"></span> 匯出Excel</asp:LinkButton>
+        <div :style="data_table.list.length === 0 ? 'pointer-events: none; opacity: 0.5;' : ''" style="display:inline-block;">
+            <asp:LinkButton ID="excel" runat="server"  CssClass="btn btn-outline-success" OnClick="export_Click"><span class="fa-solid fa-file-excel"></span> 匯出查詢資料（Excel）</asp:LinkButton>
+        </div>
     </div>
 </asp:Content>
 <asp:Content ID="Content5" ContentPlaceHolderID="footer_script" runat="Server">
@@ -24,11 +26,13 @@
         Vue.filter('timeString', function (value, myFormat) {
             return value == null || value == "" ? "" : moment(value).format(myFormat || 'YYYY-MM-DD, HH:mm:ss');
         });
-        let VueApp=new Vue({
+        let VueApp = new Vue({
             el: '#app',
             vuetify: new Vuetify(vuetify_options),
             data() {
                 return {
+                    isSearched: false,
+                    print_error_msg: '',
                     options: { multiSort: false },
                     search_options: { multiSort: false },
                     data_table: {
@@ -41,7 +45,7 @@
                         pageSize: 10,
                         header: [
                             { text: '信眾編號', value: 'f_number', align: 'start' },
-                            { text: '信眾姓名', value: 'u_name'},
+                            { text: '信眾姓名', value: 'u_name' },
                             { text: '身分別', value: 'identity_type_desc' },
                             { text: '性別', value: 'sex' },
                             { text: '生日', value: 'birthday' },
@@ -49,9 +53,9 @@
                             { text: '', value: 'slot', sortable: false },
                             { text: '', value: 'slot_btn', sortable: false, align: 'end' },
                         ],
-                        footer:{
+                        footer: {
                             showFirstLastPage: true,
-                            pageSizeOptions:[5,10,20,30],
+                            pageSizeOptions: [5, 10, 20, 30],
                         },
                     },
                     search: {
@@ -60,7 +64,7 @@
                         sex: '',
                         //birthday: new Date().toISOString().split('T')[0],
                         //birthday2: new Date().toISOString().split('T')[0]
-                        birthday:'',
+                        birthday: '',
                         birthday2: '',
                         address: '',
                         country: '',
@@ -69,7 +73,7 @@
                         /*注意這邊的參數不能跟下方print_search重複*/
                     },
                     //列印管理報表
-                    print_conditions:'yy',
+                    print_conditions: 'yy',
                     print_search: {
                         year: '',
                         month: '',
@@ -132,7 +136,12 @@
             watch: {
                 options: {
                     handler() {                    
-                        this.getList()
+                        if (this.isSearched) {
+                            this.getList()
+                        }
+                        else {
+                            this.data_table.loading = false;
+                        }
                     },
                     deep: true,
                 },
@@ -141,23 +150,101 @@
                         this.search_get()
                     },
                     deep: true,
-                },    
+                }
             }, mounted() {    
+                const printResult = document.getElementById('<%= hid_err_msg.ClientID %>').value;
+                document.getElementById('<%= hid_err_msg.ClientID %>').value = '';
+                window._printResult = printResult
+
                 this.search_dialog.current = this.search_dialog.controls.search1 ///default
                 this.initPrintSearch();
+                
                 const navEntries = performance.getEntriesByType("navigation");
                 const isReload = navEntries.length > 0 && navEntries[0].type === "reload";
+                
+                const url = new URL(window.location.href);
+                let params = url.searchParams;
+                if (params.get('dirty') === '1') {  // 資料有更新時執行 getlist
+                    this.search = JSON.parse(sessionStorage.getItem("member_query_params"));
+                    this.getList();
+
+                    params.delete('dirty');
+                    window.history.replaceState({}, '', url.pathname + url.search);
+                }
+
                 if (isReload) {
                     sessionStorage.removeItem("followerpage");
+                    sessionStorage.removeItem("member_list_cache");
+                    sessionStorage.removeItem("member_query_params");
+                }
+                else if ("<%=lastAddedID%>" !== "") {
+                    const newQuery = { f_number: '<%=lastAddedID%>' };
+                    sessionStorage.setItem('member_query_params', JSON.stringify(newQuery));
+                    this.search = newQuery;
+                    this.isSearched = true;
                 }
                 else {
                     const savedPage = parseInt(sessionStorage.getItem('followerpage'));
+                    const savedData = sessionStorage.getItem("member_list_cache");
+                    const savedQuery = JSON.parse(sessionStorage.getItem("member_query_params"));
+                    if (savedQuery) {
+                        this.search = savedQuery;
+                        this.isSearched = true;
+                    }
                     if (savedPage) {
                         this.options.page = savedPage;
                     }
+                    if (savedData && savedData !== "undefined") {
+                        this.data_table = JSON.parse(savedData);
+                        this.isSearched = true;
+                    }
                 }
+
+                if (printResult === 'nodata' || printResult === 'success') {
+                    this.$nextTick(() => {
+                        this.print_search.year = parseInt(document.getElementById('<%= hid_print_year.ClientID %>').value) || this.print_search.year;
+                        this.print_search.month = parseInt(document.getElementById('<%= hid_print_month.ClientID %>').value) || this.print_search.month;
+                        this.print_search.season = parseInt(document.getElementById('<%= hid_print_season.ClientID %>').value) || this.print_search.season;
+                        this.print_conditions = document.getElementById('<%= hid_print_mode.ClientID %>').value || 'yy';
+                        this.print_dialog.show = true;
+                        if (printResult === 'nodata') {
+                            this.print_error_msg = "查無資料，請重新選擇區間";
+                        }
+                    });
+                }
+                this.$nextTick(() => {
+                    setTimeout(() => {
+                        // 清空 URL
+                        const cleanUrl = window.location.protocol + "//" + window.location.host + window.location.pathname;
+                        window.history.replaceState({}, '', cleanUrl);
+                    }, 100);
+                });
             },
             methods: {
+                triggerManagementExport(mode) {
+                    this.print_dialog.show = false;
+                    this.print_error_msg = "";
+                    if (this.print_search.year == '') {
+                        msgbox('請輸入年份');
+                        return;
+                    } 
+
+                    document.getElementById('<%= hid_print_mode.ClientID %>').value = this.print_conditions;
+                    document.getElementById('<%= hid_print_year.ClientID %>').value = this.print_search.year;
+                    if (this.print_conditions == 'mm') {
+                        document.getElementById('<%= hid_print_month.ClientID %>').value = this.print_search.month;
+                    }
+                    else if (this.print_conditions == 'ss') {
+                        document.getElementById('<%= hid_print_season.ClientID %>').value = this.print_search.season;
+                    }
+
+                    if (mode === 'print') {
+                        document.getElementById('<%= print_management.ClientID %>').click();
+                    }
+                    else if (mode === "excel") {
+                        document.getElementById('<%= excel_management.ClientID %>').click();
+                    }
+                },
                 search_show(curr) {
                     //console.log("btn_click:", curr, curr.api_url);
                     this.search_dialog.current = curr;
@@ -228,6 +315,7 @@
                     //console.log(row, row["u_name"], row["f_number"], curr.id, target);
                 },
                 getList(clearpage = false) {
+                    console.log("do getlist")
                     const { sortBy, sortDesc, page, itemsPerPage } = this.options
                     const params = {
                         sortBy: sortBy[0], sortDesc: sortDesc[0],
@@ -241,6 +329,9 @@
                             this.data_table.list = response.data.list
                             this.data_table.count = response.data.count;
                             this.data_table.loading = false
+
+                            const dataToStore = JSON.stringify(this.data_table);
+                            sessionStorage.setItem("member_list_cache", dataToStore);
                         })
                         .catch(
                             error => console.log(error)
@@ -262,7 +353,7 @@
                         const index = this.data_table.list.indexOf(item)
                         if (index != -1) {
                             axios
-                                .delete(HTTP_HOST + 'api/follower/' + item.num)
+                                .delete(HTTP_HOST + 'api/follower/Delete/' + item.num)
                                 .then(response => {
                                     this.getList();
                                 })
@@ -282,18 +373,23 @@
                                 //}
                                 //this.data_table.selected = [];
                                 //this.data_table.count = this.data_table.list.length
-                                location.reload();
+                                //location.reload();
+                                this.getList();
                             })
                             .catch(error => console.log(error))
                     }
                 },
                 btn_search() {
+                    this.isSearched = true;
+                    sessionStorage.setItem("member_query_params", JSON.stringify(this.search));
                     this.getList(true)
                     bootstrap.Offcanvas.getInstance(document.getElementById("offcanvasRight")).hide()
                 },
                 btn_all() {
+                    this.isSearched = false;
                     clearObjProps(this.search);
-                    this.btn_search()
+                    sessionStorage.setItem("member_query_params", JSON.stringify(this.search));
+                    //this.btn_search()
                 },   
                 goPrint() {
                     //debugger;
@@ -309,6 +405,7 @@
                 //列印管理報表
                 print_close() {
                     this.print_dialog.show = false;
+                    this.print_error_msg = "";
                 }
                 ,
                 initPrintSearch() {
@@ -391,10 +488,31 @@
             $('#country2').val('');
             VueApp.search.country2 = '';
         });
+        
+        $(document).ready(function () {
+            // 判斷是否彈出 search dialog
+            let hasSearchResult = sessionStorage.getItem("member_list_cache") !== null;
+
+            if (!hasSearchResult && window._printResult === '') {
+                let $btn = $("a[data-bs-target='#offcanvasRight'][href='#search_panel']");
+                $btn.click();
+                let el = document.getElementById('offcanvasRight');
+                let offcanvas = bootstrap.Offcanvas.getOrCreateInstance(el);
+                offcanvas.show();
+            }
+        });
     </script>   
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
     <uc1:alert runat="server" ID="L_msg" Text="" />
+    <asp:HiddenField ID="hid_err_msg" runat="server" />
+    <asp:HiddenField ID="hid_print_year" runat="server" />
+    <asp:HiddenField ID="hid_print_month" runat="server" />
+    <asp:HiddenField ID="hid_print_season" runat="server" />
+    <asp:HiddenField ID="hid_print_mode" runat="server" />
+    <asp:HiddenField ID="hid_qry" runat="server" />
+    <asp:LinkButton ID="excel_management" runat="server" OnClick="export_Click" style="display:none;" />
+    <asp:LinkButton ID="print_management" runat="server" OnClick="export_Click" style="display:none;" />
     <div id="content" class="container-fluid">
         <v-data-table 
             v-model="data_table.selected"
@@ -508,9 +626,17 @@
                          </v-col>
                              
                     </v-row> 
+                    <v-row>
+                        <v-col>
+                            <div v-if="print_error_msg" class="red--text mt-2 text-center" style="font-weight: bold;">
+                                {{ print_error_msg }}
+                            </div>
+                        </v-col>
+                    </v-row>
                     <v-row  densee class="pt-3" >
                           <v-col  :cols="12"  class="pt-3 text-center" > 
-                                <v-btn class="ma-2" color="primary" dark  @click="goPrint2" >  列印 </v-btn>
+                                <v-btn class="ma-2" color="primary" dark  @click="triggerManagementExport('print')" >  列印 </v-btn>
+                                <v-btn class="ma-2" color="primary" dark  @click="triggerManagementExport('excel')">  匯出 Excel </v-btn>
                                 <v-btn class="ma-2" color="green" dark  @click="print_close" >  取消 </v-btn>
                           </v-col>                                   
                     </v-row>    

web/admin/follower/index.aspx.cs

@@ -1,17 +1,20 @@
-using System;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Data;
 using System.Data.OleDb;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-using System.Configuration;
-using System.IO;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Spreadsheet;
-using System.Linq;
+using System.Windows.Controls;
+using System.Windows.Interop;
 using static TreeView;
 
 
@@ -19,11 +22,17 @@ public partial class admin_follower_index : MyWeb.config
 {
     public int page = 1;
     private Model.ezEntities _db = new Model.ezEntities();
+    protected string lastAddedID;
     protected void Page_Load(object sender, EventArgs e)
     {
 
         if (!IsPostBack)
         {
+            if (Session["LastAddedID"] != null)
+            {
+                lastAddedID = Session["LastAddedID"].ToString();
+                Session.Remove("LastAddedID");
+            }
             BuildKind();
         }
         else
@@ -42,10 +51,10 @@ public partial class admin_follower_index : MyWeb.config
         //國籍
         s_country.Items.Clear();
         s_country.Items.Add(new ListItem("請選擇", ""));
-        var qry =_db.countries.OrderBy(x => x.range).ThenBy(x => x.name_en).ToList();
+        var qry = _db.countries.OrderBy(x => x.range).ThenBy(x => x.name_en).ToList();
         if (qry.Count > 0)
         {
-            foreach(var x in qry)           
+            foreach (var x in qry)
                 s_country.Items.Add(new ListItem(x.name_zh, x.ID));
         }
 
@@ -68,208 +77,310 @@ public partial class admin_follower_index : MyWeb.config
     #endregion
 
 
-    #region 匯出Excel
+    #region 匯出
 
-    protected void excel_Click(object sender, EventArgs e)
+    protected void export_Click(object sender, EventArgs e)
     {
         var memoryStream = new MemoryStream();
-        using (var doc = SpreadsheetDocument.Create(memoryStream, SpreadsheetDocumentType.Workbook))
+
+        LinkButton btn = sender as LinkButton;
+        if (btn == null) return;
+        bool isPrintMode = (btn.ID == "print_management");
+        bool isExcelMode = (btn.ID == "excel_management" || btn.ID == "excel");
+        bool isManagementMode = (btn.ID == "excel_management" || btn.ID == "print_management");
+
+        //查詢要匯出的資料
+        string _query = "";     // 紀錄匯出條件
+        var list = searchData(ref _query, isManagementMode);
+
+        if (isExcelMode)
         {
-            var wb = doc.AddWorkbookPart();
-            wb.Workbook = new Workbook();
-            var sheets = wb.Workbook.AppendChild(new Sheets());
-
-            //建立第一個頁籤
-            var ws = wb.AddNewPart<WorksheetPart>();
-            ws.Worksheet = new Worksheet();
-            sheets.Append(new Sheet()
-            {
-                Id = wb.GetIdOfPart(ws),
-                SheetId = 1,
-                Name = "信眾資料"
-            });
-
-            //設定欄寬
-            var cu = new Columns();
-            cu.Append(
-                new Column { Min = 1, Max = 2, Width = 15, CustomWidth = true },
-                new Column { Min = 3, Max = 3, Width = 10, CustomWidth = true },
-                new Column { Min = 4, Max = 11, Width = 15, CustomWidth = true },
-                new Column { Min = 12, Max = 12, Width = 25, CustomWidth = true },
-                new Column { Min = 13, Max = 13, Width = 8, CustomWidth = true },
-                new Column { Min = 14, Max = 14, Width = 35, CustomWidth = true },
-                new Column { Min = 15, Max = 16, Width = 15, CustomWidth = true }
-            );
-            ws.Worksheet.Append(cu);
-
-            //建立資料頁
-            var sd = new SheetData();
-            ws.Worksheet.AppendChild(sd);
-
-            //第一列資料
-            var tr = new Row();
-            tr.Append(
-                new Cell() { CellValue = new CellValue("信眾編號"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("信眾姓名"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("性別"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("身分別"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("生日(國曆)"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("聯絡電話"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("手機號碼"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("皈依道場"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("皈依法名"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("皈依日期"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("加入日期"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("緊急連絡人"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("緊急連絡人電話"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("血型"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("國籍"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("收件地址"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("介紹人"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("LINE帳號"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("其它社群帳號"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("建檔日期"), DataType = CellValues.String }
-                ,new Cell() { CellValue = new CellValue("身分證號"), DataType = CellValues.String }
-                //,new Cell() { CellValue = new CellValue("SHA"), DataType = CellValues.String }
-            );
-            sd.AppendChild(tr);
-
-            //查詢要匯出的資料
-            
-            //紀錄匯出條件
-             string _query = "";
-            
-            var list = searchData(ref _query);
             if (list.Count > 0)
             {
-                MyWeb.encrypt encrypt = new MyWeb.encrypt();
-                Model.country country = new Model.country();
-                var tdesc = publicFun.enum_desc<Model.follower.type>();
-                foreach (var item in list)
+                using (var doc = SpreadsheetDocument.Create(memoryStream, SpreadsheetDocumentType.Workbook))
                 {
-                    //新增資料列
-                    tr = new Row();
-                    string s1, s2, sha;
-                    s1= encrypt.DecryptAutoKey(item.phone);
-                    s2= encrypt.DecryptAutoKey(item.id_code);
-                    sha = encrypt.followerHash(s1, s2);
+                    var wb = doc.AddWorkbookPart();
+                    wb.Workbook = new Workbook();
+                    var sheets = wb.Workbook.AppendChild(new Sheets());
+
+                    //建立第一個頁籤
+                    var ws = wb.AddNewPart<WorksheetPart>();
+                    ws.Worksheet = new Worksheet();
+                    sheets.Append(new Sheet()
+                    {
+                        Id = wb.GetIdOfPart(ws),
+                        SheetId = 1,
+                        Name = "信眾資料"
+                    });
+
+                    //設定欄寬
+                    var cu = new Columns();
+                    cu.Append(
+                        new Column { Min = 1, Max = 2, Width = 15, CustomWidth = true },
+                        new Column { Min = 3, Max = 3, Width = 10, CustomWidth = true },
+                        new Column { Min = 4, Max = 11, Width = 15, CustomWidth = true },
+                        new Column { Min = 12, Max = 12, Width = 25, CustomWidth = true },
+                        new Column { Min = 13, Max = 13, Width = 8, CustomWidth = true },
+                        new Column { Min = 14, Max = 14, Width = 35, CustomWidth = true },
+                        new Column { Min = 15, Max = 16, Width = 15, CustomWidth = true }
+                    );
+                    ws.Worksheet.Append(cu);
+
+                    //建立資料頁
+                    var sd = new SheetData();
+                    ws.Worksheet.AppendChild(sd);
+
+                    //第一列資料
+                    var tr = new Row();
                     tr.Append(
-                        new Cell() { CellValue = new CellValue(item.f_number), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.u_name), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.sex), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(!isStrNull(item.identity_type)? tdesc[item.identity_type ?? 1] :""), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.birthday.HasValue ? ValDate(item.birthday.Value).ToString("yyyy/MM/dd") : ""), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.phone)), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.cellphone)), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.refuge_area), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.refuge_name), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.refugedate.HasValue ? ValDate(item.refugedate.Value).ToString("yyyy/MM/dd") : ""), DataType = CellValues.String },                   
-                        new Cell() { CellValue = new CellValue(item.join_date.HasValue ? ValDate(item.join_date.Value).ToString("yyyy/MM/dd") : ""), DataType = CellValues.String },                   
-                        new Cell() { CellValue = new CellValue(item.contactor), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.contactor_phone)), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.blood), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(!isStrNull(item.country) ? item.country1.name_zh : ""), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.address), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.introducer), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.socialid1), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.socialid2), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.reg_time.HasValue ? ValDate(item.reg_time.Value).ToString("yyyy/MM/dd HH:mm:ss") : ""), DataType = CellValues.String }
-                        ,new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.id_code)), DataType = CellValues.String }
-                        //, new Cell() { CellValue = new CellValue(sha), DataType = CellValues.String }
-                        );
+                        new Cell() { CellValue = new CellValue("信眾編號"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("信眾姓名"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("性別"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("身分別"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("生日(國曆)"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("聯絡電話"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("手機號碼"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("皈依道場"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("皈依法名"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("皈依日期"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("加入日期"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("緊急連絡人"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("緊急連絡人電話"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("血型"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("國籍"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("收件地址"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("介紹人"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("LINE帳號"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("其它社群帳號"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("建檔日期"), DataType = CellValues.String }
+                        , new Cell() { CellValue = new CellValue("身分證號"), DataType = CellValues.String }
+                    //,new Cell() { CellValue = new CellValue("SHA"), DataType = CellValues.String }
+                    );
                     sd.AppendChild(tr);
+
+
+                    MyWeb.encrypt encrypt = new MyWeb.encrypt();
+                    Model.country country = new Model.country();
+                    var tdesc = publicFun.enum_desc<Model.follower.type>();
+                    foreach (var item in list)
+                    {
+                        //新增資料列
+                        tr = new Row();
+                        string s1, s2, sha;
+                        s1 = encrypt.DecryptAutoKey(item.phone);
+                        s2 = encrypt.DecryptAutoKey(item.id_code);
+                        sha = encrypt.followerHash(s1, s2);
+                        tr.Append(
+                            new Cell() { CellValue = new CellValue(item.f_number), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.u_name), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.sex), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(!isStrNull(item.identity_type) ? tdesc[item.identity_type ?? 1] : ""), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.birthday.HasValue ? ValDate(item.birthday.Value).ToString("yyyy/MM/dd") : ""), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.phone)), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.cellphone)), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.refuge_area), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.refuge_name), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.refugedate.HasValue ? ValDate(item.refugedate.Value).ToString("yyyy/MM/dd") : ""), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.join_date.HasValue ? ValDate(item.join_date.Value).ToString("yyyy/MM/dd") : ""), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.contactor), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.contactor_phone)), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.blood), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(!isStrNull(item.country) ? item.country1.name_zh : ""), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.address), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.introducer), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.socialid1), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.socialid2), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.reg_time.HasValue ? ValDate(item.reg_time.Value).ToString("yyyy/MM/dd HH:mm:ss") : ""), DataType = CellValues.String }
+                            , new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.id_code)), DataType = CellValues.String }
+                            //, new Cell() { CellValue = new CellValue(sha), DataType = CellValues.String }
+                            );
+                        sd.AppendChild(tr);
+                    }
+
+                    //空一列
+                    tr = new Row();
+                    sd.AppendChild(tr);
+
+                    //匯出資訊
+                    string _data = "匯出時間 : " + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+                    _data += " " + admin.info.u_id;
+                    tr = new Row();
+                    tr.Append(
+                            new Cell() { CellValue = new CellValue(_data), DataType = CellValues.String }
+                                );
+                    sd.AppendChild(tr);
+
+                    _data = "匯出條件 : " + (!isStrNull(_query) ? _query : "-");
+                    tr = new Row();
+                    tr.Append(
+                            new Cell() { CellValue = new CellValue(_data), DataType = CellValues.String }
+                                );
+                    sd.AppendChild(tr);
+
+
+                    Model.admin_log admin_log = new Model.admin_log();
+                    admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Follower, (int)Model.admin_log.Status.Excel, admin_log.LogViewBtn(list.Select(x => x.f_number + x.u_name).ToList()));
+
+
                 }
+                HttpContext.Current.Response.Clear();
+                HttpContext.Current.Response.AddHeader("content-disposition", "attachment;  filename=信眾_data.xlsx");
+                HttpContext.Current.Response.ContentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+                HttpContext.Current.Response.BinaryWrite(memoryStream.ToArray());
+                HttpContext.Current.Response.End();
 
-                //空一列
-                tr = new Row();
-                sd.AppendChild(tr);
-
-                //匯出資訊
-                string _data = "匯出時間 : " + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
-                _data += " " + admin.info.u_id;
-                tr = new Row();
-                tr.Append(
-                       new Cell() { CellValue = new CellValue(_data), DataType = CellValues.String }
-                         );
-                sd.AppendChild(tr);
-
-                _data = "匯出條件 : " + (!isStrNull(_query) ? _query : "-");
-                tr = new Row();
-                tr.Append(
-                       new Cell() { CellValue = new CellValue(_data), DataType = CellValues.String }
-                         );
-                sd.AppendChild(tr);
-
-
-                Model.admin_log admin_log = new Model.admin_log();
-                admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Follower, (int)Model.admin_log.Status.Excel, admin_log.LogViewBtn(list.Select(x => x.f_number + x.u_name).ToList()));
-
+                hid_err_msg.Value = "success";
             }
             else
             {
-                ScriptMsg2("查無資料");
+                //ScriptMsg2("查無資料");
+                hid_err_msg.Value = "nodata";
             }
         }
+        else if (isPrintMode)
+        {
+            string urlParams = "";
+            int selYear = !string.IsNullOrEmpty(hid_print_year.Value) ? int.Parse(hid_print_year.Value) : 0;
+            int selMonth = !string.IsNullOrEmpty(hid_print_month.Value) ? int.Parse(hid_print_month.Value) : 0;
+            int selSeason = !string.IsNullOrEmpty(hid_print_season.Value) ? int.Parse(hid_print_season.Value) : 0;
+            string selMode = !string.IsNullOrEmpty(hid_print_mode.Value) ? hid_print_mode.Value : "";
             
-        HttpContext.Current.Response.Clear();
-        HttpContext.Current.Response.AddHeader("content-disposition", "attachment;  filename=信眾_data.xlsx");
-        HttpContext.Current.Response.ContentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-        HttpContext.Current.Response.BinaryWrite(memoryStream.ToArray());
-        HttpContext.Current.Response.End();
+            var qry = _db.followers.AsQueryable();
+            if (selYear > 0)
+            {
+                urlParams += "&year=" + selYear;
+            }
+            if (selMode == "mm" && selMonth > 0)
+            {
+                urlParams += "&month=" + selMonth;
+            }
+            else if (selMode == "ss" && selSeason > 0)
+            {
+                urlParams += "&season=" + selSeason;
+            }
 
+            if (list.Count > 0)
+            {
+                hid_err_msg.Value = "success";
+                hid_print_year.Value = selYear.ToString();
+                hid_print_month.Value = selMonth.ToString();
+                hid_print_season.Value = selSeason.ToString();
+                hid_print_mode.Value = selMode;
+
+                string script = $@"window.open('print.aspx?{urlParams}&mode={selMode}', '列印信眾資料', 'noopener,noreferrer');";
+                ScriptManager.RegisterStartupScript(this, GetType(), "ExecutePrint", script, true);
+            }
+            else
+            {
+                hid_err_msg.Value = "nodata";
+            }
+        }   
     }
-    protected List<Model.follower> searchData(ref string _query)
+    protected List<Model.follower> searchData(ref string _query, bool isManagementMode = false)
     {
 
         //查詢要匯出的資料
         var qry = _db.followers.AsQueryable();
 
-        //紀錄匯出條件
-        if (!isStrNull(s_f_number.Value))
+        // 管理報表
+        if (isManagementMode)
         {
-            qry = qry.Where(o => o.f_number.Contains(s_f_number.Value.Trim()));
+            int selYear = !string.IsNullOrEmpty(hid_print_year.Value) ? int.Parse(hid_print_year.Value) : 0;
+            int selMonth = !string.IsNullOrEmpty(hid_print_month.Value) ? int.Parse(hid_print_month.Value) : 0;
+            int selSeason = !string.IsNullOrEmpty(hid_print_season.Value) ? int.Parse(hid_print_season.Value) : 0;
+            string selMode = !string.IsNullOrEmpty(hid_print_mode.Value) ? hid_print_mode.Value : "";
+
+            if (selYear > 0)
+            {
+                qry = qry.Where(o => o.join_date.HasValue && o.join_date.Value.Year == selYear);
+                _query += "年份:" + selYear + "\n";
+            }
+            if (selMode == "mm" && selMonth > 0)
+            {
+                qry = qry.Where(o => o.join_date.HasValue && o.join_date.Value.Month == selMonth);
+                _query += "月份:" + selMonth + "\n";
+            }
+            else if (selMode == "ss" && selSeason > 0)
+            {
+                if (selSeason == 1)
+                {
+                    qry = qry.Where(o => o.join_date.HasValue)
+                        .Where(o => o.join_date.Value.Month == 1 || o.join_date.Value.Month == 2 || o.join_date.Value.Month == 3);
+                }
+                else if (selSeason == 2)
+                {
+                    qry = qry.Where(o => o.join_date.HasValue)
+                        .Where(o => o.join_date.Value.Month == 4 || o.join_date.Value.Month == 5 || o.join_date.Value.Month == 6);
+                }
+                else if (selSeason == 3)
+                {
+                    qry = qry.Where(o => o.join_date.HasValue)
+                        .Where(o => o.join_date.Value.Month == 7 || o.join_date.Value.Month == 8 || o.join_date.Value.Month == 9);
+                }
+                else if (selSeason == 4)
+                {
+                    qry = qry.Where(o => o.join_date.HasValue)
+                        .Where(o => o.join_date.Value.Month == 10 || o.join_date.Value.Month == 11 || o.join_date.Value.Month == 12);
+                }
+
+                _query += "季度:" + selSeason + "\n";
+            }
+
+            qry = qry.OrderByDescending(o => o.num);
+            return qry.ToList();
+        }
+        else
+        // 匯出查詢資料
+        {
+            //紀錄匯出條件
+            if (!isStrNull(s_f_number.Value))
+            {
+                qry = qry.Where(o => o.f_number.Contains(s_f_number.Value.Trim()));
 
                 _query += "信眾編號:" + s_f_number.Value.Trim() + "\n";
 
-        }
+            }
 
-        if (!isStrNull(s_u_name.Value))
-        {
-            qry = qry.Where(o => o.u_name.Contains(s_u_name.Value.Trim()));
+            if (!isStrNull(s_u_name.Value))
+            {
+                qry = qry.Where(o => o.u_name.Contains(s_u_name.Value.Trim()));
 
                 _query += "信眾姓名:" + s_u_name.Value.Trim() + "\n";
 
-        }
-        if (!isStrNull(s_address.Value))
-        {
-            qry = qry.Where(o => o.address.Contains(s_address.Value.Trim()));
-            _query += "地址:" + s_u_name.Value.Trim() + "\n";
-        }
-        
-        // 電話/證號搜尋 (使用 search_keywords HEX 編碼)
-        if (!isStrNull(s_phone_idcode.Value) && GlobalVariables.UseSearchKeywords)
-        {
-            MyWeb.encrypt encrypt = new MyWeb.encrypt();
-            string hexSearch = encrypt.ConvertToHex(s_phone_idcode.Value.Trim());
-            if (!string.IsNullOrEmpty(hexSearch))
-            {
-                qry = qry.Where(o => o.search_keywords != null && o.search_keywords.Contains(hexSearch));
-                _query += "電話/證號:" + s_phone_idcode.Value.Trim() + "\n";
             }
-        }
+            if (!isStrNull(s_address.Value))
+            {
+                qry = qry.Where(o => o.address.Contains(s_address.Value.Trim()));
+                _query += "地址:" + s_address.Value.Trim() + "\n";
+            }
             
-        if (!isStrNull(s_birthday.Value) && isDate(s_birthday.Value))
-        {
-            qry = qry.Where(o => o.birthday >= ValDate(s_birthday.Value));
-            _query += "生日(起):" + s_birthday.Value.Trim() + "\n";
+            // 電話/證號搜尋 (使用 search_keywords HEX 編碼)
+            if (!isStrNull(s_phone_idcode.Value) && GlobalVariables.UseSearchKeywords)
+            {
+                MyWeb.encrypt encrypt = new MyWeb.encrypt();
+                string hexSearch = encrypt.ConvertToHex(s_phone_idcode.Value.Trim());
+                if (!string.IsNullOrEmpty(hexSearch))
+                {
+                    qry = qry.Where(o => o.search_keywords != null && o.search_keywords.Contains(hexSearch));
+                    _query += "電話/證號:" + s_phone_idcode.Value.Trim() + "\n";
+                }
+            }
+
+            if (!isStrNull(s_birthday.Value) && isDate(s_birthday.Value))
+            {
+                var tmp_s_birthday = ValDate(s_birthday.Value);
+                qry = qry.Where(o => o.birthday >= tmp_s_birthday);
+                _query += "生日(起):" + s_birthday.Value.Trim() + "\n";
+            }
+            if (!isStrNull(s_birthday2.Value) && isDate(s_birthday2.Value))
+            {
+                var tmp_s_birthday2 = Convert.ToDateTime(s_birthday2.Value).AddDays(1);
+                qry = qry.Where(o => o.birthday < tmp_s_birthday2);
+                _query += "生日(訖):" + s_birthday2.Value.Trim() + "\n";
+            }
+            qry = qry.OrderByDescending(o => o.num);
+            return qry.ToList();
         }
-        if (!isStrNull(s_birthday2.Value) && isDate(s_birthday2.Value))
-        {
-            qry = qry.Where(o => o.birthday < Convert.ToDateTime(s_birthday2.Value).AddDays(1));
-            _query += "生日(訖):" + s_birthday2.Value.Trim() + "\n";
-        }
-        qry = qry.OrderByDescending(o => o.num);
-       return qry.ToList();
 
     }
 

web/admin/follower/order_record.aspx

@@ -8,6 +8,7 @@
              <span>信眾姓名:</span><asp:Literal runat="server" ID="username"></asp:Literal>
          </div>
     </div>
+     <a href="index.aspx" class="btn btn-outline-secondary">返回</a>
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
     <div class="container-fluid">

web/admin/follower/order_record_detail.aspx

@@ -4,10 +4,11 @@
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="page_nav" Runat="Server">
     <div class="scroll-nav nav nav-tabs mb-2 mb-sm-0 d-none d-sm-flex">
-     <div class="ms-3">
-         <span>信眾姓名:</span><asp:Literal runat="server" ID="username"></asp:Literal>
-     </div>
-</div>
+         <div class="ms-3">
+             <span>信眾姓名:</span><asp:Literal runat="server" ID="username"></asp:Literal>
+         </div>
+    </div>
+    <a href="order_record.aspx?userid=<%=Request["userid"] %>" class="btn btn-outline-secondary">返回</a>
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
     <div class="container-fluid">

web/admin/follower/print.aspx.cs

@@ -3,6 +3,7 @@ using DocumentFormat.OpenXml.Vml.Office;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Information;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Web;
 using System.Web.UI;
@@ -60,7 +61,8 @@ public partial class admin_follower_print_ : System.Web.UI.Page
                 if (!string.IsNullOrEmpty(Request["birthday2"]))
                 {
                     DateTime birthday2Param = Convert.ToDateTime(Request["birthday2"].Trim());
-                    qry = qry.Where(o => o.birthday < birthday2Param.AddDays(1));
+                    var tmpBirthday2Param = birthday2Param.AddDays(1);
+                    qry = qry.Where(o => o.birthday < tmpBirthday2Param);
                     _query += "生日(訖):" + birthday2Param.ToString("yyyy/MM/dd") + "\n";
                 }
                 // ❌ 錯誤寫法: _db.countries.Where(x => x.ID == Request["country"].ToString())
@@ -86,6 +88,18 @@ public partial class admin_follower_print_ : System.Web.UI.Page
                     _query += "國家:" + (_db.countries.Where(x => x.ID == country2Id).Select(x => x.name_zh).FirstOrDefault() ?? "") + "\n";
                 }
 
+                string phone_ipcode = Request["phone_idcode"]?.ToString();
+                if (!string.IsNullOrEmpty(phone_ipcode) && GlobalVariables.UseSearchKeywords)
+                {
+                    MyWeb.encrypt encrypt = new MyWeb.encrypt();
+                    string hexSearch = encrypt.ConvertToHex(phone_ipcode.Trim());
+                    if (!string.IsNullOrEmpty(hexSearch))
+                    {
+                        qry = qry.Where(o => o.search_keywords != null && o.search_keywords.Contains(hexSearch));
+                        _query += "電話/證號:" + phone_ipcode.Trim() + "\n";
+                    }
+                }
+
                 //管理報表
                 if (!string.IsNullOrEmpty(Request["year"]))
                 {

web/admin/follower/reg.aspx

@@ -230,7 +230,7 @@
                                     { id: 'f_number', title: '編號' },
                                     { id: 'u_name', title: '姓名' },
                                     { id: 'address', title: '地址' },
-                                    { id: 'onlyfamily', title: '只查親屬'},
+                                    { id: 'onlyfamily', title: '只查親屬' },
                                 ],
                                 api_url: HTTP_HOST + 'api/follower/GetList',
                                 columns: [
@@ -314,10 +314,10 @@
                         birthday: '',
                         phoneDes: '',
                         demo: '',
-                        appellation_id_selected :
+                        appellation_id_selected:
                         {
-                            text : '',
-                            val : 0,
+                            text: '',
+                            val: 0,
                         },
 
                     },
@@ -372,7 +372,7 @@
                     ],
                     tabletsDetail: { multiSort: false },
                     tabletTable: {
-                        Loading:true,
+                        Loading: true,
                         disableButton: true,
                         searchDetail: '',
                         headersDetail: [
@@ -394,11 +394,11 @@
                             num: 0,
                             f_num: 0,
                             type: this.selectedTabletType,
-                            title:'',
+                            title: '',
                         },
                     },
                     //新:家人
-                    family:{
+                    family: {
                         dialog: false,
                         isEditing: false,
                         is_tw: true,
@@ -420,8 +420,8 @@
                             chinese_year: "",
                             zodiac: "",
                             birth_time: "",
-                            city:"",
-                            area:"",
+                            city: "",
+                            area: "",
                             address: "",
                             phone: "",
                             mobile: "",
@@ -440,8 +440,8 @@
                             chinese_year: "",
                             zodiac: "",
                             birth_time: "",
-                            city:"",
-                            area:"",
+                            city: "",
+                            area: "",
                             address: "",
                             phone: "",
                             mobile: "",
@@ -585,7 +585,7 @@
                             this.search_dialog.list = response.data.list
                             this.search_dialog.count = response.data.count
                             this.search_dialog.loading = false
-
+                            console.log(this.search_dialog.list)
                         })
                         .catch(error => {
                             console.log(error)
@@ -1318,13 +1318,32 @@
                 $('.tab-pane,.edit_Click').removeClass('pe-none'); // 移除 pe-none 類，允許編輯
             }
         });
+
+        let isComposing = false;
+        const cellphoneInput = document.querySelector('[id$="cellphone"]');
+        if (cellphoneInput) {
+            cellphoneInput.addEventListener('compositionstart', () => {
+                isComposing = true;
+            });
+            cellphoneInput.addEventListener('compositionend', (e) => {
+                isComposing = false;
+                formatCellphone(e.target);
+            });
+            cellphoneInput.addEventListener('input', (e) => {
+                if (!isComposing) {
+                    formatCellphone(e.target);
+                }
+            });
+        }
+
+
     </script>
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="page_nav" runat="Server">
     <div class="scroll-nav nav nav-tabs mb-2 mb-sm-0 d-none d-sm-flex">
          <template v-if="follower_id !='' "> {{titleword()}} </template>
     </div>
-    <div class="d-flex align-items-center">
+    <div class="">
         <div class="form-check me-3 d-none" id="editCheckboxContainer">
             <input class="form-check-input" type="checkbox" id="editCheckbox">
             <label class="form-check-label" for="editCheckbox">
@@ -1332,8 +1351,8 @@
             </label>
         </div>
         <asp:Button ID="add" runat="server" Text="送出" OnClick="add_Click" CssClass="btn btn-primary edit_Click noedit" />
-        <asp:Button ID="edit" runat="server" Text="修改" Visible="false" OnClick="edit_Click" CssClass="btn btn-primary edit_Click noedit" />
-        <asp:Button ID="goback" runat="server" Text="回列表" Visible="false" CausesValidation="false" OnClick="goback_Click" CssClass="btn btn-outline-secondary" />
+        <asp:Button ID="edit" runat="server" Text="儲存" Visible="false" OnClick="edit_Click" CssClass="btn btn-primary edit_Click noedit" />
+        <asp:Button ID="goback" runat="server" Text="取消" Visible="true" CausesValidation="false" OnClick="goback_Click" CssClass="btn btn-outline-secondary" />
     </div>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
@@ -1412,7 +1431,7 @@
                                 </div>
                             <label class="col-sm-2 col-lg-1 col-form-label">手機號碼<asp:Literal ID="cellphoneReqStar" runat="server" Text=" *"></asp:Literal></label>
                             <div class="col-sm-10 col-lg-3">
-                                <asp:TextBox ID="cellphone" MaxLength="12" runat="server" CssClass="form-control" data-encrypt="Y" placeholder="聯絡電話與手機號碼請至少填寫一項" oninput="formatCellphone(this)"></asp:TextBox>
+                                <asp:TextBox ID="cellphone" MaxLength="12" runat="server" CssClass="form-control" data-encrypt="Y" placeholder="聯絡電話與手機號碼請至少填寫一項"></asp:TextBox>
                                 <asp:RegularExpressionValidator ControlToValidate="cellphone" Display="Dynamic" ErrorMessage="格式有誤" ID="RegularExpressionValidator2" runat="server" SetFocusOnError="true"  ValidationExpression="^09\d{2}-?\d{3}-?\d{3}$" />
                                 </div>
                         </div>
@@ -2155,4 +2174,5 @@
           </template>
         </v-snackbar>
     </div>
+
 </asp:Content>

web/admin/follower/reg.aspx.cs

@@ -1,21 +1,26 @@
-using System;
+using Model;
+using Newtonsoft.Json;
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Data;
+using System.Data.Entity;
 using System.Data.OleDb;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-using System.Configuration;
-using System.IO;
-using System.Linq;
-using System.Globalization;
-using Model;
 
 public partial class admin_follower_reg : MyWeb.config
 {
     private Model.ezEntities _db = new Model.ezEntities();
     public ArrayList _tmp = new ArrayList();
+    public bool isDataChanged = false;
+    public bool isAutoNumbering = ConfigurationManager.AppSettings["IsAutoNumbering"].ToString() == "true" ? true : false;
     protected void Page_Load(object sender, EventArgs e)
     {
         CallAjax();
@@ -29,6 +34,11 @@ public partial class admin_follower_reg : MyWeb.config
 
             if (isStrNull(Request["num"]))
             {
+                if (!isAutoNumbering)
+                {
+                    f_number.ReadOnly = false;
+                }
+
                 if (!isStrNull(Request["leader"])) 
                 {
                     int _num = Val(Request["leader"]);
@@ -50,9 +60,14 @@ public partial class admin_follower_reg : MyWeb.config
                 //預設國籍
                 country.Value = "158";
                 country_txt.Value = "中華民國(台灣)";
+
+                // 預設加入日期
+                join_date.Text = DateTime.Now.ToString("yyyy-MM-dd");
             }
             else
             {
+                f_number.ReadOnly = true;
+
                 int _num = Val(Request["num"]);                  
                 var prod = qry.Where(q => q.num == _num).FirstOrDefault();
                 if (prod != null)
@@ -206,8 +221,11 @@ public partial class admin_follower_reg : MyWeb.config
                             }
                         }
                     }
-                    // 使用新的 generate_f_number 方法，已內建重號檢查和重試機制
-                    followers.f_number = follower.generate_f_number(sex.SelectedValue);
+                    if (isAutoNumbering)
+                    {
+                        // 使用新的 generate_f_number 方法，已內建重號檢查和重試機制
+                        followers.f_number = follower.generate_f_number(sex.SelectedValue);
+                    }
                     followers.identity_type = Val(identity_type.SelectedValue);
                     if(!isStrNull(leader.Value)) followers.leader = Val(leader.Value);
                     if (!isStrNull(country.Value)) followers.country = country.Value;
@@ -240,6 +258,8 @@ public partial class admin_follower_reg : MyWeb.config
                         Model.admin_log admin_log = new Model.admin_log();
                         admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Follower, (int)Model.admin_log.Status.Insert, f_number.Text + u_name.Text);
                         
+                        Session["LastAddedID"] = followers.f_number;
+                        
                         Response.Redirect("index.aspx");
                     }
                     else
@@ -310,7 +330,7 @@ public partial class admin_follower_reg : MyWeb.config
                     followers.sex = sex.SelectedValue;
                     followers.blood = blood.SelectedValue;
                     followers.tab = tab.Value.Trim(',');
-                    followers.admin_log = admin.info.u_id + " " + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+                    //followers.admin_log = admin.info.u_id + " " + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
                     followers.follower_hash = encrypt.followerHash(followers.phone, followers.id_code);
 
                     // 如果啟用 search_keywords 功能，生成並更新 search_keywords
@@ -319,13 +339,51 @@ public partial class admin_follower_reg : MyWeb.config
                         followers.search_keywords = encrypt.GenerateSearchKeywords(followers);
                     }
 
-                    _db.SaveChanges();
+                    // 檢查是否有修改資料
+                    var entry = _db.Entry(followers);
+                    this.isDataChanged = entry.CurrentValues.PropertyNames.Any(name =>
+                    {
+                        if (name == "admin_log" || name == "follower_hash")
+                            return false;
 
-                    Model.admin_log admin_log = new Model.admin_log();
-                    admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Follower, (int)Model.admin_log.Status.Update, f_number.Text + u_name.Text);
+                        var originalVal = entry.OriginalValues[name]?.ToString();
+                        var currentVal = entry.CurrentValues[name]?.ToString();
 
-                    Response.Redirect("index.aspx?page=" + Convert.ToString(Request["page"]));
+                        // 針對加密欄位進行特殊處理
+                        bool isEncryptedField = (name == "phone" || name == "id_code");
 
+                        if (isEncryptedField)
+                        {
+                            string originalPlain = !string.IsNullOrEmpty(originalVal) ? encrypt.DecryptAutoKey(originalVal) : "";
+                            string currentPlain = !string.IsNullOrEmpty(currentVal) ? encrypt.DecryptAutoKey(currentVal) : "";
+                            return originalPlain.Trim() != currentPlain.Trim();
+                        }
+
+                        return !object.Equals(originalVal, currentVal);
+                    });
+
+                    if (this.isDataChanged)
+                    {
+                        followers.admin_log = admin.info.u_id + " " + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+                    }
+                    else
+                    {
+                        entry.State = EntityState.Unchanged;
+                    }
+
+                    int isDataSaved = _db.SaveChanges();
+                    if (isDataSaved > 0)
+                    {
+                        //L_msg.Type = alert_type.success;
+                        //L_msg.Text = "修改成功";
+                        Model.admin_log admin_log = new Model.admin_log();
+                        admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Follower, (int)Model.admin_log.Status.Update, f_number.Text + u_name.Text);
+                        Response.Redirect("index.aspx?dirty=1&page=" + Convert.ToString(Request["page"]));
+                    }
+                    else
+                    {
+                        Response.Redirect("index.aspx?page=" + Convert.ToString(Request["page"]));
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -339,7 +397,7 @@ public partial class admin_follower_reg : MyWeb.config
                 L_msg.Type = alert_type.danger;
                 L_msg.Text = "查無資料";
             }
-            /*
+           /*
             if (chk_pro_num(f_number.Text, Val(Request["num"])))
             {
             }

web/admin/guadan/create.aspx

@@ -160,7 +160,7 @@
         style="border-bottom: 1px solid #eee;"
       >
         <div class="d-flex align-center">
-          <span class="font-weight-bold">续住</span>
+          <span class="font-weight-bold">續住</span>
         </div>
         <v-btn icon @click="closeXuzhuGuestModalMethod">
           <v-icon>mdi-close</v-icon>
@@ -170,11 +170,11 @@
       <!-- 弹窗内容 -->
       <v-card-text class="flex-grow-1 py-6" style="overflow-y: auto;">
         <div class="mb-4">
-          <span class="font-weight-medium">当前退房时间：</span>
+          <span class="font-weight-medium">當前退房時間：</span>
           <span class="text-primary">{{ guadanguest.xuzhu.currentCheckoutDate }}</span>
         </div>
         <div class="d-flex align-center">
-          <span class="font-weight-medium mr-2">续住后退房时间:</span>
+          <span class="font-weight-medium mr-2">續住後退房時間:</span>
           <input
             type="date"
             id="newCheckoutDate"
@@ -187,7 +187,7 @@
 
       <!-- 弹窗操作按钮 -->
       <v-card-actions class="justify-end pt-4" style="border-top: 1px solid #eee;">
-        <v-btn color="primary" class="px-6" @click="xuzhuPost">续住</v-btn>
+        <v-btn color="primary" class="px-6" @click="xuzhuPost">續住</v-btn>
         <v-btn text class="ml-2" @click="closeXuzhuGuestModalMethod">取消</v-btn>
       </v-card-actions>
     </v-card>
@@ -1069,11 +1069,11 @@
                 xuzhuPost() {
                     // 校验必填
                     if (!this.guadanguest.xuzhu.guestUuid || !this.guadanguest.xuzhu.guestBedUuid) {
-                        alert("GuestUuid 和 GuestBedUuid 不能为空");
+                        alert("GuestUuid 和 GuestBedUuid 不能為空");
                         return;
                     }
                     if (!this.guadanguest.xuzhu.newCheckoutDate || !this.guadanguest.xuzhu.currentCheckoutDate) {
-                        alert("续住时间不能为空");
+                        alert("續住時間不能為空");
                         return;
                     }
 
@@ -1087,8 +1087,8 @@
                     axios.post(HTTP_HOST + 'api/guadanorderguest/xuzhu', payload)
                         .then((res) => {
                             this.$refs.messageModal.open({
-                                title: '续住成功',
-                                message: '客人续住已处理',
+                                title: '續住成功',
+                                message: '續住以處理',
                                 status: 'success',
                                 callback: () => {
                                     // 弹窗关闭后的回调
@@ -1096,7 +1096,7 @@
                                         this.getGuadanOrderGuestByOrderNo();
                                     }
                                     catch (error) {
-                                        console.error("发生错误：", error.message);
+                                        console.error("發生錯誤：", error.message);
                                     } finally {
                                         this.closeXuzhuGuestModalMethod();
                                     }
@@ -1105,8 +1105,8 @@
                         })
                         .catch((error) => {
                             this.$refs.messageModal.open({
-                                title: '续住失败',
-                                message: error.response?.data?.message || '系统异常，请稍后重试',
+                                title: '續住失敗',
+                                message: error.response?.data?.message || '系統異常，請稍後重試',
                                 status: 'error'
                             });
                         });

web/admin/guadan/statistics_table.aspx

@@ -17,7 +17,7 @@
     <div class="col">
       <div class="p-3 bg-light text-center rounded shadow"  style="min-height: 180px;">
         <div class="fs-2">📝</div>
-        <div class="text-muted small mt-1">总挂单次数</div>
+        <div class="text-muted small mt-1">總掛單次數</div>
         <div class="fw-bold fs-5 mt-1">{{ guadanStatistics.guadanTotalCount }}</div>
       </div>
     </div>
@@ -25,7 +25,7 @@
     <div class="col">
       <div class="p-3 bg-light text-center rounded shadow"  style="min-height: 180px;">
         <div class="fs-2">📋</div>
-        <div class="text-muted small mt-1">当前挂单数量</div>
+        <div class="text-muted small mt-1">當前掛單數</div>
         <div class="fw-bold fs-5 mt-1">{{ guadanStatistics.guadanCurrentCount }}</div>
       </div>
     </div>
@@ -33,7 +33,7 @@
     <div class="col">
       <div class="p-3 bg-light text-center rounded shadow"  style="min-height: 180px;">
         <div class="fs-2">👥</div>
-        <div class="text-muted small mt-1">总挂单人数</div>
+        <div class="text-muted small mt-1">總掛單人數</div>
         <div class="fw-bold fs-5 mt-1">
           {{ guadanStatistics.guadanPeopleTotal }} （男：{{ guadanStatistics.guadanPeopleMale }}，女：{{ guadanStatistics.guadanPeopleFemale }}）
         </div>
@@ -215,7 +215,7 @@
                         { text: '房间数量', value: 'roomcount' },
                         { text: '床位数量', value: 'bedcount' },
                         { text: '预约人数', value: 'todaytotalbookers' },
-                        { text: '已入住人数', value: 'checkin'},
+                        { text: '已入住人數', value: 'checkin'},
                         { text: '可用床位', value: 'availableBeds' },
                         { text: '床位利用率', value: 'bedusagerate' }
                     ],
@@ -303,7 +303,7 @@
                 },
                 exportStatisticsToExcel() {
                     if (!this.items || !this.items.length) {
-                        console.warn("没有数据可导出");
+                        console.warn("沒有數據可匯出");
                         return;
                     }
 
@@ -319,7 +319,7 @@
 
                     // 3. 创建 Workbook 并添加 Sheet
                     const wb = XLSX.utils.book_new();
-                    XLSX.utils.book_append_sheet(wb, ws, "统计数据");
+                    XLSX.utils.book_append_sheet(wb, ws, "統計數據");
 
                     // 4. 写入 Excel 并下载
                     const wbout = XLSX.write(wb, { bookType: "xlsx", type: "array" });

web/admin/index.aspx

@@ -105,5 +105,36 @@
         </div>
     </div>
     <!-- /.content_box -->
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+        var accountInput = document.getElementById('<%= u_id.ClientID %>');
+        var passwordInput = document.getElementById('<%= u_password.ClientID %>');
+        var chkInput = document.getElementById('<%= chknum.ClientID %>');
+        var btn = document.getElementById('<%= Button1.ClientID %>');
+
+        accountInput.addEventListener('keypress', function (e){
+            if (e.keyCode === 13) {
+                $("#<%= u_password.ClientID %>").focus();
+                return false;
+            }
+        })
+
+        passwordInput.addEventListener('keypress', function (e) {
+            if (e.keyCode === 13) {
+                $("#<%= chknum.ClientID %>").focus();
+                return false;
+            }
+        })
+
+        var triggerLogin = function (e) {
+            if (e.keyCode === 13) {
+                btn.click();
+                e.preventDefault();
+                return false;
+            }
+        };
+        if (chkInput) chkInput.addEventListener('keypress', triggerLogin);
+    });
+</script>
 </asp:Content>
 

web/admin/item/TabletDesigner.aspx.cs

@@ -0,0 +1,104 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Services;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+// 定義與前端一致的元素結構
+public class TabletElement
+{
+    public string id { get; set; }
+    public string type { get; set; }
+    public string text { get; set; }
+    public double x { get; set; }
+    public double y { get; set; }
+    public double? width { get; set; }
+    public double? height { get; set; }
+    public ElementStyle style { get; set; }
+    public string hidden { get; set; }
+    public double? twoOffset { get; set; }
+    public double? threeOffset { get; set; }
+    public double? fourOffset { get; set; }
+    public int? breakLen { get; set; }
+    public string backendInp { get; set; }
+    public double? textWidth { get; set; }
+    public double? textHeight { get; set; }
+ 
+}
+
+public class ElementStyle
+{
+    public double fontSize { get; set; }
+    public string fontFamily { get; set; }
+    public bool isVertical { get; set; }
+    public double letterSpacing { get; set; }
+    public double lineHeight { get; set; }
+    public double? itemSpacing { get; set; }
+    public string visibility { get; set; }
+}
+
+public partial class admin_item_TabletDesigner :MyWeb.config
+{
+
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+    [WebMethod]
+    public static string SaveDesigner()
+    {
+
+        return "";
+    }
+    [WebMethod]
+    public static string GetConfig()
+    {
+        // 模擬原本的 GetConfig() 行為
+        var config = new
+        {
+            elements = new List<TabletElement> {
+                new TabletElement {
+                    id = "address", type = "address", text = "台中市潭子區中山路", x = 60, y = 80,
+                    style = new ElementStyle { fontSize = 24, fontFamily = "Kaiti", isVertical = true, letterSpacing = 5, lineHeight = 1.5,visibility="" }
+                },
+                new TabletElement {
+                    id = "title1", type = "ancestor", text = "張一\n李二\n陳三\n吳四\n劉五\n趙六\n林七\n徐八", x = 50, y = 80,
+                     width=136,height=600,textWidth=20,textHeight=90,
+                    style = new ElementStyle { fontSize = 16, fontFamily = "Kaiti", isVertical = true, letterSpacing = 1, lineHeight = 1 ,visibility="" }
+                },
+                new TabletElement {
+                    id = "lefttitle", type = "ancestor", text = "左正名", x = 10, y = 80,
+                    style = new ElementStyle { fontSize = 24, fontFamily = "Kaiti", isVertical = true, letterSpacing = 5, lineHeight = 1.5 ,visibility="" }
+                },
+                new TabletElement {
+                    id = "righttitle", type = "ancestor", text = "右正名", x = 50, y = 80,
+                    style = new ElementStyle { fontSize = 24, fontFamily = "Kaiti", isVertical = true, letterSpacing = 5, lineHeight = 1.5 ,visibility="" }
+                },
+                new TabletElement {
+                    id = "titletriangle", type = "roster", text = "張一\n李二\n陳三\n吳四\n劉五\n趙六\n林七\n徐八", x = 10, y = 80,
+                    style = new ElementStyle { fontSize = 24, fontFamily = "Kaiti", isVertical = true, letterSpacing = 5, lineHeight = 1.5,visibility=""  }
+                },
+                new TabletElement
+                {
+                    id="tricombined",type="combined-center",text="林張吳\n氏歷代祖先", x = 10, y = 80,
+                    style = new ElementStyle { fontSize = 24, fontFamily = "Kaiti", isVertical = true, letterSpacing = 5, lineHeight = 1.5 ,visibility="" }
+                },
+                new TabletElement
+                {
+                    id="combined",type="combined-center",text="李王\n氏歷代祖先", x = 10, y = 80,
+                    style = new ElementStyle { fontSize = 24, fontFamily = "Kaiti", isVertical = true, letterSpacing = 5, lineHeight = 1.5 ,visibility="" }
+                },
+                new TabletElement
+                {
+                    id="alive",type="alive",text="陽上名字", x = 60, y = 200,
+                    style = new ElementStyle { fontSize = 18, fontFamily = "Kaiti", isVertical = true, letterSpacing = 5, lineHeight = 1.5 ,visibility="" }
+                }
+            },
+            paper = new { width = 100, height = 272, name = "Yellow" }
+        };
+        return JsonConvert.SerializeObject(config);
+    }
+}

web/admin/item/bootstrap/css/bootstrap-reboot.css

@@ -0,0 +1,601 @@
+/*!
+ * Bootstrap Reboot v5.3.8 (https://getbootstrap.com/)
+ * Copyright 2011-2025 The Bootstrap Authors
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ */
+:root,
+[data-bs-theme=light] {
+  --bs-blue: #0d6efd;
+  --bs-indigo: #6610f2;
+  --bs-purple: #6f42c1;
+  --bs-pink: #d63384;
+  --bs-red: #dc3545;
+  --bs-orange: #fd7e14;
+  --bs-yellow: #ffc107;
+  --bs-green: #198754;
+  --bs-teal: #20c997;
+  --bs-cyan: #0dcaf0;
+  --bs-black: #000;
+  --bs-white: #fff;
+  --bs-gray: #6c757d;
+  --bs-gray-dark: #343a40;
+  --bs-gray-100: #f8f9fa;
+  --bs-gray-200: #e9ecef;
+  --bs-gray-300: #dee2e6;
+  --bs-gray-400: #ced4da;
+  --bs-gray-500: #adb5bd;
+  --bs-gray-600: #6c757d;
+  --bs-gray-700: #495057;
+  --bs-gray-800: #343a40;
+  --bs-gray-900: #212529;
+  --bs-primary: #0d6efd;
+  --bs-secondary: #6c757d;
+  --bs-success: #198754;
+  --bs-info: #0dcaf0;
+  --bs-warning: #ffc107;
+  --bs-danger: #dc3545;
+  --bs-light: #f8f9fa;
+  --bs-dark: #212529;
+  --bs-primary-rgb: 13, 110, 253;
+  --bs-secondary-rgb: 108, 117, 125;
+  --bs-success-rgb: 25, 135, 84;
+  --bs-info-rgb: 13, 202, 240;
+  --bs-warning-rgb: 255, 193, 7;
+  --bs-danger-rgb: 220, 53, 69;
+  --bs-light-rgb: 248, 249, 250;
+  --bs-dark-rgb: 33, 37, 41;
+  --bs-primary-text-emphasis: #052c65;
+  --bs-secondary-text-emphasis: #2b2f32;
+  --bs-success-text-emphasis: #0a3622;
+  --bs-info-text-emphasis: #055160;
+  --bs-warning-text-emphasis: #664d03;
+  --bs-danger-text-emphasis: #58151c;
+  --bs-light-text-emphasis: #495057;
+  --bs-dark-text-emphasis: #495057;
+  --bs-primary-bg-subtle: #cfe2ff;
+  --bs-secondary-bg-subtle: #e2e3e5;
+  --bs-success-bg-subtle: #d1e7dd;
+  --bs-info-bg-subtle: #cff4fc;
+  --bs-warning-bg-subtle: #fff3cd;
+  --bs-danger-bg-subtle: #f8d7da;
+  --bs-light-bg-subtle: #fcfcfd;
+  --bs-dark-bg-subtle: #ced4da;
+  --bs-primary-border-subtle: #9ec5fe;
+  --bs-secondary-border-subtle: #c4c8cb;
+  --bs-success-border-subtle: #a3cfbb;
+  --bs-info-border-subtle: #9eeaf9;
+  --bs-warning-border-subtle: #ffe69c;
+  --bs-danger-border-subtle: #f1aeb5;
+  --bs-light-border-subtle: #e9ecef;
+  --bs-dark-border-subtle: #adb5bd;
+  --bs-white-rgb: 255, 255, 255;
+  --bs-black-rgb: 0, 0, 0;
+  --bs-font-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+  --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
+  --bs-body-font-family: var(--bs-font-sans-serif);
+  --bs-body-font-size: 1rem;
+  --bs-body-font-weight: 400;
+  --bs-body-line-height: 1.5;
+  --bs-body-color: #212529;
+  --bs-body-color-rgb: 33, 37, 41;
+  --bs-body-bg: #fff;
+  --bs-body-bg-rgb: 255, 255, 255;
+  --bs-emphasis-color: #000;
+  --bs-emphasis-color-rgb: 0, 0, 0;
+  --bs-secondary-color: rgba(33, 37, 41, 0.75);
+  --bs-secondary-color-rgb: 33, 37, 41;
+  --bs-secondary-bg: #e9ecef;
+  --bs-secondary-bg-rgb: 233, 236, 239;
+  --bs-tertiary-color: rgba(33, 37, 41, 0.5);
+  --bs-tertiary-color-rgb: 33, 37, 41;
+  --bs-tertiary-bg: #f8f9fa;
+  --bs-tertiary-bg-rgb: 248, 249, 250;
+  --bs-heading-color: inherit;
+  --bs-link-color: #0d6efd;
+  --bs-link-color-rgb: 13, 110, 253;
+  --bs-link-decoration: underline;
+  --bs-link-hover-color: #0a58ca;
+  --bs-link-hover-color-rgb: 10, 88, 202;
+  --bs-code-color: #d63384;
+  --bs-highlight-color: #212529;
+  --bs-highlight-bg: #fff3cd;
+  --bs-border-width: 1px;
+  --bs-border-style: solid;
+  --bs-border-color: #dee2e6;
+  --bs-border-color-translucent: rgba(0, 0, 0, 0.175);
+  --bs-border-radius: 0.375rem;
+  --bs-border-radius-sm: 0.25rem;
+  --bs-border-radius-lg: 0.5rem;
+  --bs-border-radius-xl: 1rem;
+  --bs-border-radius-xxl: 2rem;
+  --bs-border-radius-2xl: var(--bs-border-radius-xxl);
+  --bs-border-radius-pill: 50rem;
+  --bs-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+  --bs-box-shadow-sm: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
+  --bs-box-shadow-lg: 0 1rem 3rem rgba(0, 0, 0, 0.175);
+  --bs-box-shadow-inset: inset 0 1px 2px rgba(0, 0, 0, 0.075);
+  --bs-focus-ring-width: 0.25rem;
+  --bs-focus-ring-opacity: 0.25;
+  --bs-focus-ring-color: rgba(13, 110, 253, 0.25);
+  --bs-form-valid-color: #198754;
+  --bs-form-valid-border-color: #198754;
+  --bs-form-invalid-color: #dc3545;
+  --bs-form-invalid-border-color: #dc3545;
+}
+
+[data-bs-theme=dark] {
+  color-scheme: dark;
+  --bs-body-color: #dee2e6;
+  --bs-body-color-rgb: 222, 226, 230;
+  --bs-body-bg: #212529;
+  --bs-body-bg-rgb: 33, 37, 41;
+  --bs-emphasis-color: #fff;
+  --bs-emphasis-color-rgb: 255, 255, 255;
+  --bs-secondary-color: rgba(222, 226, 230, 0.75);
+  --bs-secondary-color-rgb: 222, 226, 230;
+  --bs-secondary-bg: #343a40;
+  --bs-secondary-bg-rgb: 52, 58, 64;
+  --bs-tertiary-color: rgba(222, 226, 230, 0.5);
+  --bs-tertiary-color-rgb: 222, 226, 230;
+  --bs-tertiary-bg: #2b3035;
+  --bs-tertiary-bg-rgb: 43, 48, 53;
+  --bs-primary-text-emphasis: #6ea8fe;
+  --bs-secondary-text-emphasis: #a7acb1;
+  --bs-success-text-emphasis: #75b798;
+  --bs-info-text-emphasis: #6edff6;
+  --bs-warning-text-emphasis: #ffda6a;
+  --bs-danger-text-emphasis: #ea868f;
+  --bs-light-text-emphasis: #f8f9fa;
+  --bs-dark-text-emphasis: #dee2e6;
+  --bs-primary-bg-subtle: #031633;
+  --bs-secondary-bg-subtle: #161719;
+  --bs-success-bg-subtle: #051b11;
+  --bs-info-bg-subtle: #032830;
+  --bs-warning-bg-subtle: #332701;
+  --bs-danger-bg-subtle: #2c0b0e;
+  --bs-light-bg-subtle: #343a40;
+  --bs-dark-bg-subtle: #1a1d20;
+  --bs-primary-border-subtle: #084298;
+  --bs-secondary-border-subtle: #41464b;
+  --bs-success-border-subtle: #0f5132;
+  --bs-info-border-subtle: #087990;
+  --bs-warning-border-subtle: #997404;
+  --bs-danger-border-subtle: #842029;
+  --bs-light-border-subtle: #495057;
+  --bs-dark-border-subtle: #343a40;
+  --bs-heading-color: inherit;
+  --bs-link-color: #6ea8fe;
+  --bs-link-hover-color: #8bb9fe;
+  --bs-link-color-rgb: 110, 168, 254;
+  --bs-link-hover-color-rgb: 139, 185, 254;
+  --bs-code-color: #e685b5;
+  --bs-highlight-color: #dee2e6;
+  --bs-highlight-bg: #664d03;
+  --bs-border-color: #495057;
+  --bs-border-color-translucent: rgba(255, 255, 255, 0.15);
+  --bs-form-valid-color: #75b798;
+  --bs-form-valid-border-color: #75b798;
+  --bs-form-invalid-color: #ea868f;
+  --bs-form-invalid-border-color: #ea868f;
+}
+
+*,
+*::before,
+*::after {
+  box-sizing: border-box;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  :root {
+    scroll-behavior: smooth;
+  }
+}
+
+body {
+  margin: 0;
+  font-family: var(--bs-body-font-family);
+  font-size: var(--bs-body-font-size);
+  font-weight: var(--bs-body-font-weight);
+  line-height: var(--bs-body-line-height);
+  color: var(--bs-body-color);
+  text-align: var(--bs-body-text-align);
+  background-color: var(--bs-body-bg);
+  -webkit-text-size-adjust: 100%;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+hr {
+  margin: 1rem 0;
+  color: inherit;
+  border: 0;
+  border-top: var(--bs-border-width) solid;
+  opacity: 0.25;
+}
+
+h6, h5, h4, h3, h2, h1 {
+  margin-top: 0;
+  margin-bottom: 0.5rem;
+  font-weight: 500;
+  line-height: 1.2;
+  color: var(--bs-heading-color);
+}
+
+h1 {
+  font-size: calc(1.375rem + 1.5vw);
+}
+@media (min-width: 1200px) {
+  h1 {
+    font-size: 2.5rem;
+  }
+}
+
+h2 {
+  font-size: calc(1.325rem + 0.9vw);
+}
+@media (min-width: 1200px) {
+  h2 {
+    font-size: 2rem;
+  }
+}
+
+h3 {
+  font-size: calc(1.3rem + 0.6vw);
+}
+@media (min-width: 1200px) {
+  h3 {
+    font-size: 1.75rem;
+  }
+}
+
+h4 {
+  font-size: calc(1.275rem + 0.3vw);
+}
+@media (min-width: 1200px) {
+  h4 {
+    font-size: 1.5rem;
+  }
+}
+
+h5 {
+  font-size: 1.25rem;
+}
+
+h6 {
+  font-size: 1rem;
+}
+
+p {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+abbr[title] {
+  -webkit-text-decoration: underline dotted;
+  text-decoration: underline dotted;
+  cursor: help;
+  -webkit-text-decoration-skip-ink: none;
+  text-decoration-skip-ink: none;
+}
+
+address {
+  margin-bottom: 1rem;
+  font-style: normal;
+  line-height: inherit;
+}
+
+ol,
+ul {
+  padding-left: 2rem;
+}
+
+ol,
+ul,
+dl {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+ol ol,
+ul ul,
+ol ul,
+ul ol {
+  margin-bottom: 0;
+}
+
+dt {
+  font-weight: 700;
+}
+
+dd {
+  margin-bottom: 0.5rem;
+  margin-left: 0;
+}
+
+blockquote {
+  margin: 0 0 1rem;
+}
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+small {
+  font-size: 0.875em;
+}
+
+mark {
+  padding: 0.1875em;
+  color: var(--bs-highlight-color);
+  background-color: var(--bs-highlight-bg);
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 0.75em;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+a {
+  color: rgba(var(--bs-link-color-rgb), var(--bs-link-opacity, 1));
+  text-decoration: underline;
+}
+a:hover {
+  --bs-link-color-rgb: var(--bs-link-hover-color-rgb);
+}
+
+a:not([href]):not([class]), a:not([href]):not([class]):hover {
+  color: inherit;
+  text-decoration: none;
+}
+
+pre,
+code,
+kbd,
+samp {
+  font-family: var(--bs-font-monospace);
+  font-size: 1em;
+}
+
+pre {
+  display: block;
+  margin-top: 0;
+  margin-bottom: 1rem;
+  overflow: auto;
+  font-size: 0.875em;
+}
+pre code {
+  font-size: inherit;
+  color: inherit;
+  word-break: normal;
+}
+
+code {
+  font-size: 0.875em;
+  color: var(--bs-code-color);
+  word-wrap: break-word;
+}
+a > code {
+  color: inherit;
+}
+
+kbd {
+  padding: 0.1875rem 0.375rem;
+  font-size: 0.875em;
+  color: var(--bs-body-bg);
+  background-color: var(--bs-body-color);
+  border-radius: 0.25rem;
+}
+kbd kbd {
+  padding: 0;
+  font-size: 1em;
+}
+
+figure {
+  margin: 0 0 1rem;
+}
+
+img,
+svg {
+  vertical-align: middle;
+}
+
+table {
+  caption-side: bottom;
+  border-collapse: collapse;
+}
+
+caption {
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
+  color: var(--bs-secondary-color);
+  text-align: left;
+}
+
+th {
+  text-align: inherit;
+  text-align: -webkit-match-parent;
+}
+
+thead,
+tbody,
+tfoot,
+tr,
+td,
+th {
+  border-color: inherit;
+  border-style: solid;
+  border-width: 0;
+}
+
+label {
+  display: inline-block;
+}
+
+button {
+  border-radius: 0;
+}
+
+button:focus:not(:focus-visible) {
+  outline: 0;
+}
+
+input,
+button,
+select,
+optgroup,
+textarea {
+  margin: 0;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+
+button,
+select {
+  text-transform: none;
+}
+
+[role=button] {
+  cursor: pointer;
+}
+
+select {
+  word-wrap: normal;
+}
+select:disabled {
+  opacity: 1;
+}
+
+[list]:not([type=date]):not([type=datetime-local]):not([type=month]):not([type=week]):not([type=time])::-webkit-calendar-picker-indicator {
+  display: none !important;
+}
+
+button,
+[type=button],
+[type=reset],
+[type=submit] {
+  -webkit-appearance: button;
+}
+button:not(:disabled),
+[type=button]:not(:disabled),
+[type=reset]:not(:disabled),
+[type=submit]:not(:disabled) {
+  cursor: pointer;
+}
+
+::-moz-focus-inner {
+  padding: 0;
+  border-style: none;
+}
+
+textarea {
+  resize: vertical;
+}
+
+fieldset {
+  min-width: 0;
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  float: left;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 0.5rem;
+  line-height: inherit;
+  font-size: calc(1.275rem + 0.3vw);
+}
+@media (min-width: 1200px) {
+  legend {
+    font-size: 1.5rem;
+  }
+}
+legend + * {
+  clear: left;
+}
+
+::-webkit-datetime-edit-fields-wrapper,
+::-webkit-datetime-edit-text,
+::-webkit-datetime-edit-minute,
+::-webkit-datetime-edit-hour-field,
+::-webkit-datetime-edit-day-field,
+::-webkit-datetime-edit-month-field,
+::-webkit-datetime-edit-year-field {
+  padding: 0;
+}
+
+::-webkit-inner-spin-button {
+  height: auto;
+}
+
+[type=search] {
+  -webkit-appearance: textfield;
+  outline-offset: -2px;
+}
+[type=search]::-webkit-search-cancel-button {
+  cursor: pointer;
+  filter: grayscale(1);
+}
+
+/* rtl:raw:
+[type="tel"],
+[type="url"],
+[type="email"],
+[type="number"] {
+  direction: ltr;
+}
+*/
+::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+::-webkit-color-swatch-wrapper {
+  padding: 0;
+}
+
+::-webkit-file-upload-button {
+  font: inherit;
+  -webkit-appearance: button;
+}
+
+::file-selector-button {
+  font: inherit;
+  -webkit-appearance: button;
+}
+
+output {
+  display: inline-block;
+}
+
+iframe {
+  border: 0;
+}
+
+summary {
+  display: list-item;
+  cursor: pointer;
+}
+
+progress {
+  vertical-align: baseline;
+}
+
+[hidden] {
+  display: none !important;
+}
+
+/*# sourceMappingURL=bootstrap-reboot.css.map */

web/admin/item/bootstrap/css/bootstrap-reboot.rtl.css

@@ -0,0 +1,598 @@
+/*!
+ * Bootstrap Reboot v5.3.8 (https://getbootstrap.com/)
+ * Copyright 2011-2025 The Bootstrap Authors
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ */
+:root,
+[data-bs-theme=light] {
+  --bs-blue: #0d6efd;
+  --bs-indigo: #6610f2;
+  --bs-purple: #6f42c1;
+  --bs-pink: #d63384;
+  --bs-red: #dc3545;
+  --bs-orange: #fd7e14;
+  --bs-yellow: #ffc107;
+  --bs-green: #198754;
+  --bs-teal: #20c997;
+  --bs-cyan: #0dcaf0;
+  --bs-black: #000;
+  --bs-white: #fff;
+  --bs-gray: #6c757d;
+  --bs-gray-dark: #343a40;
+  --bs-gray-100: #f8f9fa;
+  --bs-gray-200: #e9ecef;
+  --bs-gray-300: #dee2e6;
+  --bs-gray-400: #ced4da;
+  --bs-gray-500: #adb5bd;
+  --bs-gray-600: #6c757d;
+  --bs-gray-700: #495057;
+  --bs-gray-800: #343a40;
+  --bs-gray-900: #212529;
+  --bs-primary: #0d6efd;
+  --bs-secondary: #6c757d;
+  --bs-success: #198754;
+  --bs-info: #0dcaf0;
+  --bs-warning: #ffc107;
+  --bs-danger: #dc3545;
+  --bs-light: #f8f9fa;
+  --bs-dark: #212529;
+  --bs-primary-rgb: 13, 110, 253;
+  --bs-secondary-rgb: 108, 117, 125;
+  --bs-success-rgb: 25, 135, 84;
+  --bs-info-rgb: 13, 202, 240;
+  --bs-warning-rgb: 255, 193, 7;
+  --bs-danger-rgb: 220, 53, 69;
+  --bs-light-rgb: 248, 249, 250;
+  --bs-dark-rgb: 33, 37, 41;
+  --bs-primary-text-emphasis: #052c65;
+  --bs-secondary-text-emphasis: #2b2f32;
+  --bs-success-text-emphasis: #0a3622;
+  --bs-info-text-emphasis: #055160;
+  --bs-warning-text-emphasis: #664d03;
+  --bs-danger-text-emphasis: #58151c;
+  --bs-light-text-emphasis: #495057;
+  --bs-dark-text-emphasis: #495057;
+  --bs-primary-bg-subtle: #cfe2ff;
+  --bs-secondary-bg-subtle: #e2e3e5;
+  --bs-success-bg-subtle: #d1e7dd;
+  --bs-info-bg-subtle: #cff4fc;
+  --bs-warning-bg-subtle: #fff3cd;
+  --bs-danger-bg-subtle: #f8d7da;
+  --bs-light-bg-subtle: #fcfcfd;
+  --bs-dark-bg-subtle: #ced4da;
+  --bs-primary-border-subtle: #9ec5fe;
+  --bs-secondary-border-subtle: #c4c8cb;
+  --bs-success-border-subtle: #a3cfbb;
+  --bs-info-border-subtle: #9eeaf9;
+  --bs-warning-border-subtle: #ffe69c;
+  --bs-danger-border-subtle: #f1aeb5;
+  --bs-light-border-subtle: #e9ecef;
+  --bs-dark-border-subtle: #adb5bd;
+  --bs-white-rgb: 255, 255, 255;
+  --bs-black-rgb: 0, 0, 0;
+  --bs-font-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+  --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
+  --bs-body-font-family: var(--bs-font-sans-serif);
+  --bs-body-font-size: 1rem;
+  --bs-body-font-weight: 400;
+  --bs-body-line-height: 1.5;
+  --bs-body-color: #212529;
+  --bs-body-color-rgb: 33, 37, 41;
+  --bs-body-bg: #fff;
+  --bs-body-bg-rgb: 255, 255, 255;
+  --bs-emphasis-color: #000;
+  --bs-emphasis-color-rgb: 0, 0, 0;
+  --bs-secondary-color: rgba(33, 37, 41, 0.75);
+  --bs-secondary-color-rgb: 33, 37, 41;
+  --bs-secondary-bg: #e9ecef;
+  --bs-secondary-bg-rgb: 233, 236, 239;
+  --bs-tertiary-color: rgba(33, 37, 41, 0.5);
+  --bs-tertiary-color-rgb: 33, 37, 41;
+  --bs-tertiary-bg: #f8f9fa;
+  --bs-tertiary-bg-rgb: 248, 249, 250;
+  --bs-heading-color: inherit;
+  --bs-link-color: #0d6efd;
+  --bs-link-color-rgb: 13, 110, 253;
+  --bs-link-decoration: underline;
+  --bs-link-hover-color: #0a58ca;
+  --bs-link-hover-color-rgb: 10, 88, 202;
+  --bs-code-color: #d63384;
+  --bs-highlight-color: #212529;
+  --bs-highlight-bg: #fff3cd;
+  --bs-border-width: 1px;
+  --bs-border-style: solid;
+  --bs-border-color: #dee2e6;
+  --bs-border-color-translucent: rgba(0, 0, 0, 0.175);
+  --bs-border-radius: 0.375rem;
+  --bs-border-radius-sm: 0.25rem;
+  --bs-border-radius-lg: 0.5rem;
+  --bs-border-radius-xl: 1rem;
+  --bs-border-radius-xxl: 2rem;
+  --bs-border-radius-2xl: var(--bs-border-radius-xxl);
+  --bs-border-radius-pill: 50rem;
+  --bs-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+  --bs-box-shadow-sm: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
+  --bs-box-shadow-lg: 0 1rem 3rem rgba(0, 0, 0, 0.175);
+  --bs-box-shadow-inset: inset 0 1px 2px rgba(0, 0, 0, 0.075);
+  --bs-focus-ring-width: 0.25rem;
+  --bs-focus-ring-opacity: 0.25;
+  --bs-focus-ring-color: rgba(13, 110, 253, 0.25);
+  --bs-form-valid-color: #198754;
+  --bs-form-valid-border-color: #198754;
+  --bs-form-invalid-color: #dc3545;
+  --bs-form-invalid-border-color: #dc3545;
+}
+
+[data-bs-theme=dark] {
+  color-scheme: dark;
+  --bs-body-color: #dee2e6;
+  --bs-body-color-rgb: 222, 226, 230;
+  --bs-body-bg: #212529;
+  --bs-body-bg-rgb: 33, 37, 41;
+  --bs-emphasis-color: #fff;
+  --bs-emphasis-color-rgb: 255, 255, 255;
+  --bs-secondary-color: rgba(222, 226, 230, 0.75);
+  --bs-secondary-color-rgb: 222, 226, 230;
+  --bs-secondary-bg: #343a40;
+  --bs-secondary-bg-rgb: 52, 58, 64;
+  --bs-tertiary-color: rgba(222, 226, 230, 0.5);
+  --bs-tertiary-color-rgb: 222, 226, 230;
+  --bs-tertiary-bg: #2b3035;
+  --bs-tertiary-bg-rgb: 43, 48, 53;
+  --bs-primary-text-emphasis: #6ea8fe;
+  --bs-secondary-text-emphasis: #a7acb1;
+  --bs-success-text-emphasis: #75b798;
+  --bs-info-text-emphasis: #6edff6;
+  --bs-warning-text-emphasis: #ffda6a;
+  --bs-danger-text-emphasis: #ea868f;
+  --bs-light-text-emphasis: #f8f9fa;
+  --bs-dark-text-emphasis: #dee2e6;
+  --bs-primary-bg-subtle: #031633;
+  --bs-secondary-bg-subtle: #161719;
+  --bs-success-bg-subtle: #051b11;
+  --bs-info-bg-subtle: #032830;
+  --bs-warning-bg-subtle: #332701;
+  --bs-danger-bg-subtle: #2c0b0e;
+  --bs-light-bg-subtle: #343a40;
+  --bs-dark-bg-subtle: #1a1d20;
+  --bs-primary-border-subtle: #084298;
+  --bs-secondary-border-subtle: #41464b;
+  --bs-success-border-subtle: #0f5132;
+  --bs-info-border-subtle: #087990;
+  --bs-warning-border-subtle: #997404;
+  --bs-danger-border-subtle: #842029;
+  --bs-light-border-subtle: #495057;
+  --bs-dark-border-subtle: #343a40;
+  --bs-heading-color: inherit;
+  --bs-link-color: #6ea8fe;
+  --bs-link-hover-color: #8bb9fe;
+  --bs-link-color-rgb: 110, 168, 254;
+  --bs-link-hover-color-rgb: 139, 185, 254;
+  --bs-code-color: #e685b5;
+  --bs-highlight-color: #dee2e6;
+  --bs-highlight-bg: #664d03;
+  --bs-border-color: #495057;
+  --bs-border-color-translucent: rgba(255, 255, 255, 0.15);
+  --bs-form-valid-color: #75b798;
+  --bs-form-valid-border-color: #75b798;
+  --bs-form-invalid-color: #ea868f;
+  --bs-form-invalid-border-color: #ea868f;
+}
+
+*,
+*::before,
+*::after {
+  box-sizing: border-box;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  :root {
+    scroll-behavior: smooth;
+  }
+}
+
+body {
+  margin: 0;
+  font-family: var(--bs-body-font-family);
+  font-size: var(--bs-body-font-size);
+  font-weight: var(--bs-body-font-weight);
+  line-height: var(--bs-body-line-height);
+  color: var(--bs-body-color);
+  text-align: var(--bs-body-text-align);
+  background-color: var(--bs-body-bg);
+  -webkit-text-size-adjust: 100%;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+hr {
+  margin: 1rem 0;
+  color: inherit;
+  border: 0;
+  border-top: var(--bs-border-width) solid;
+  opacity: 0.25;
+}
+
+h6, h5, h4, h3, h2, h1 {
+  margin-top: 0;
+  margin-bottom: 0.5rem;
+  font-weight: 500;
+  line-height: 1.2;
+  color: var(--bs-heading-color);
+}
+
+h1 {
+  font-size: calc(1.375rem + 1.5vw);
+}
+@media (min-width: 1200px) {
+  h1 {
+    font-size: 2.5rem;
+  }
+}
+
+h2 {
+  font-size: calc(1.325rem + 0.9vw);
+}
+@media (min-width: 1200px) {
+  h2 {
+    font-size: 2rem;
+  }
+}
+
+h3 {
+  font-size: calc(1.3rem + 0.6vw);
+}
+@media (min-width: 1200px) {
+  h3 {
+    font-size: 1.75rem;
+  }
+}
+
+h4 {
+  font-size: calc(1.275rem + 0.3vw);
+}
+@media (min-width: 1200px) {
+  h4 {
+    font-size: 1.5rem;
+  }
+}
+
+h5 {
+  font-size: 1.25rem;
+}
+
+h6 {
+  font-size: 1rem;
+}
+
+p {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+abbr[title] {
+  -webkit-text-decoration: underline dotted;
+  text-decoration: underline dotted;
+  cursor: help;
+  -webkit-text-decoration-skip-ink: none;
+  text-decoration-skip-ink: none;
+}
+
+address {
+  margin-bottom: 1rem;
+  font-style: normal;
+  line-height: inherit;
+}
+
+ol,
+ul {
+  padding-right: 2rem;
+}
+
+ol,
+ul,
+dl {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+ol ol,
+ul ul,
+ol ul,
+ul ol {
+  margin-bottom: 0;
+}
+
+dt {
+  font-weight: 700;
+}
+
+dd {
+  margin-bottom: 0.5rem;
+  margin-right: 0;
+}
+
+blockquote {
+  margin: 0 0 1rem;
+}
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+small {
+  font-size: 0.875em;
+}
+
+mark {
+  padding: 0.1875em;
+  color: var(--bs-highlight-color);
+  background-color: var(--bs-highlight-bg);
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 0.75em;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+a {
+  color: rgba(var(--bs-link-color-rgb), var(--bs-link-opacity, 1));
+  text-decoration: underline;
+}
+a:hover {
+  --bs-link-color-rgb: var(--bs-link-hover-color-rgb);
+}
+
+a:not([href]):not([class]), a:not([href]):not([class]):hover {
+  color: inherit;
+  text-decoration: none;
+}
+
+pre,
+code,
+kbd,
+samp {
+  font-family: var(--bs-font-monospace);
+  font-size: 1em;
+}
+
+pre {
+  display: block;
+  margin-top: 0;
+  margin-bottom: 1rem;
+  overflow: auto;
+  font-size: 0.875em;
+}
+pre code {
+  font-size: inherit;
+  color: inherit;
+  word-break: normal;
+}
+
+code {
+  font-size: 0.875em;
+  color: var(--bs-code-color);
+  word-wrap: break-word;
+}
+a > code {
+  color: inherit;
+}
+
+kbd {
+  padding: 0.1875rem 0.375rem;
+  font-size: 0.875em;
+  color: var(--bs-body-bg);
+  background-color: var(--bs-body-color);
+  border-radius: 0.25rem;
+}
+kbd kbd {
+  padding: 0;
+  font-size: 1em;
+}
+
+figure {
+  margin: 0 0 1rem;
+}
+
+img,
+svg {
+  vertical-align: middle;
+}
+
+table {
+  caption-side: bottom;
+  border-collapse: collapse;
+}
+
+caption {
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
+  color: var(--bs-secondary-color);
+  text-align: right;
+}
+
+th {
+  text-align: inherit;
+  text-align: -webkit-match-parent;
+}
+
+thead,
+tbody,
+tfoot,
+tr,
+td,
+th {
+  border-color: inherit;
+  border-style: solid;
+  border-width: 0;
+}
+
+label {
+  display: inline-block;
+}
+
+button {
+  border-radius: 0;
+}
+
+button:focus:not(:focus-visible) {
+  outline: 0;
+}
+
+input,
+button,
+select,
+optgroup,
+textarea {
+  margin: 0;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+
+button,
+select {
+  text-transform: none;
+}
+
+[role=button] {
+  cursor: pointer;
+}
+
+select {
+  word-wrap: normal;
+}
+select:disabled {
+  opacity: 1;
+}
+
+[list]:not([type=date]):not([type=datetime-local]):not([type=month]):not([type=week]):not([type=time])::-webkit-calendar-picker-indicator {
+  display: none !important;
+}
+
+button,
+[type=button],
+[type=reset],
+[type=submit] {
+  -webkit-appearance: button;
+}
+button:not(:disabled),
+[type=button]:not(:disabled),
+[type=reset]:not(:disabled),
+[type=submit]:not(:disabled) {
+  cursor: pointer;
+}
+
+::-moz-focus-inner {
+  padding: 0;
+  border-style: none;
+}
+
+textarea {
+  resize: vertical;
+}
+
+fieldset {
+  min-width: 0;
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  float: right;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 0.5rem;
+  line-height: inherit;
+  font-size: calc(1.275rem + 0.3vw);
+}
+@media (min-width: 1200px) {
+  legend {
+    font-size: 1.5rem;
+  }
+}
+legend + * {
+  clear: right;
+}
+
+::-webkit-datetime-edit-fields-wrapper,
+::-webkit-datetime-edit-text,
+::-webkit-datetime-edit-minute,
+::-webkit-datetime-edit-hour-field,
+::-webkit-datetime-edit-day-field,
+::-webkit-datetime-edit-month-field,
+::-webkit-datetime-edit-year-field {
+  padding: 0;
+}
+
+::-webkit-inner-spin-button {
+  height: auto;
+}
+
+[type=search] {
+  -webkit-appearance: textfield;
+  outline-offset: -2px;
+}
+[type=search]::-webkit-search-cancel-button {
+  cursor: pointer;
+  filter: grayscale(1);
+}
+
+[type="tel"],
+[type="url"],
+[type="email"],
+[type="number"] {
+  direction: ltr;
+}
+::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+::-webkit-color-swatch-wrapper {
+  padding: 0;
+}
+
+::-webkit-file-upload-button {
+  font: inherit;
+  -webkit-appearance: button;
+}
+
+::file-selector-button {
+  font: inherit;
+  -webkit-appearance: button;
+}
+
+output {
+  display: inline-block;
+}
+
+iframe {
+  border: 0;
+}
+
+summary {
+  display: list-item;
+  cursor: pointer;
+}
+
+progress {
+  vertical-align: baseline;
+}
+
+[hidden] {
+  display: none !important;
+}
+/*# sourceMappingURL=bootstrap-reboot.rtl.css.map */

web/admin/item/css/floating.css

@@ -0,0 +1,6 @@
+.floating-box{
+    position:fixed;
+    width:260px;
+    z-index:9999;
+    max-height:calc(100vh-100px);
+}

web/admin/item/css/styles.css

@@ -0,0 +1,61 @@
+/* You can add global styles to this file, and also import other style files */
+
+/*@import "bootstrap/scss/bootstrap";
+@import "bootstrap-icons/font/bootstrap-icons";*/
+
+// 3. 自定義全域樣式 (讓 Sidebar 滿版)
+html, body {
+  height: 100%;
+  // 修正捲軸在 Dark mode 的顏色
+  &[data-bs-theme="dark"] {
+    color-scheme: dark;
+  }
+}
+
+// Sidebar 固定寬度設定 (可依需求調整)
+.sidebar {
+  width: 250px;
+  min-height: 100vh;
+  transition: all 0.3s;
+
+  @include media-breakpoint-down(md) {
+    width: 100%; // 手機版變成全寬或隱藏
+    min-height: auto;
+  }
+}
+
+.main-content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  overflow-y: auto; // 內容區域獨立捲動
+}
+
+input[type="checkbox"]{
+
+  /* 1. Remove native styles */
+  -webkit-appearance: none;
+  appearance: none;
+
+  width: 25px !important;
+  height: 25px !important;
+
+  border: 2px solid #555; /* Your custom border */
+  border-radius: 4px;      /* Optional: rounded corners */
+  outline: none;
+  cursor: pointer;
+
+  /* Layout for the checkmark */
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  margin-right: 8px;
+  vertical-align: middle;
+  background-color: white;
+  transition: all 0.2s ease;
+}
+
+$toast-max-width: 500px;
+$toast-font-size: 1.5rem;
+

web/admin/item/css/tablet-design.css

@@ -0,0 +1,250 @@
+:host {
+  display: block;
+  width: auto;
+  height: auto;
+  --canvas-bg: #f8f9fa;
+  --canvas-grid: #dee2e6;
+  --paper-bg: #fffbf0;
+  --paper-shadow: rgba(0,0,0,0.1);
+  --selection-color: #0d6efd;
+}
+
+:host-context([data-bs-theme="dark"]) {
+  --canvas-bg: #0f1114;
+  --canvas-grid: #2b3035;
+  --paper-shadow: rgba(0,0,0,0.8);
+  /* 紙張保持米黃，因為它是實物模擬 */
+}
+
+/*.yangshang-wrapper {
+    display: flex !important;
+    flex-direction: row !important;*/ /* 垂直堆疊 */
+    /*justify-content: space-between !important;*/ /* 陽上與拜薦各據頂底 */
+    /*align-items: center !important;*/ /* 水平方向置中 */
+    /*height: 100% !important;
+    width: 100% !important;
+    writing-mode: vertical-rl !important;*/ /* 確保內部文字均為垂直書寫 */
+    /*text-orientation: upright !important;*/ /* 確保文字方向轉正 */
+    /*gap: 1px;
+}*/
+
+.designer-root {
+  /* 防止瀏覽器預設捲動影響畫布 */
+  overflow: hidden;
+}
+
+.canvas-area {
+    background-color: var(--canvas-bg);
+    background-image: linear-gradient(45deg, var(--canvas-grid) 25%, transparent 25%), linear-gradient(-45deg, var(--canvas-grid) 25%, transparent 25%), linear-gradient(45deg, transparent 75%, var(--canvas-grid) 75%), linear-gradient(-45deg, transparent 75%, var(--canvas-grid) 75%);
+    background-size: 20px 20px;
+    transition: background-color 0.3s;
+/*    min-height: 100vw;*/
+   
+}
+
+.tablet-paper {
+  background-color: var(--paper-bg);
+  box-shadow: 0 10px 30px var(--paper-shadow);
+  transition: all 0.3s;
+  overflow: hidden;
+  /* 確保在列印時被視為一個分頁單元 */
+  page-break-inside: avoid;
+}
+
+.tablet-element {
+  cursor: move;
+  padding: 4px;
+  color: black !important; /* 強制墨水為黑色 */
+  border: 1px solid transparent;
+  transition: writing-mode 0.3s, transform 0.2s;
+}
+.tablet-element:hover { border-color: rgba(13, 110, 253, 0.3); }
+
+
+/* 直書模式核心 */
+.vertical-text {
+  writing-mode: vertical-rl;
+  text-orientation: mixed; /* 這是關鍵：中文直立，英文轉90度 */
+  white-space: pre-wrap;
+}
+
+/* 縱中橫 (讓直書中的數字變成橫向) */
+.tate-chu-yoko {
+  text-combine-upright: all; /* 擠在一起 */
+  /* 或者使用 digits 4 (但在某些瀏覽器支援度不一，all 比較保險) */
+  display: inline-block;
+  letter-spacing: 0; /* 數字之間不要有間距 */
+}
+
+/* 名單金字塔佈局容器 */
+.roster-container {
+  width: 100%; height: 600px;
+  writing-mode: vertical-rl; /* 直書 */
+  display: flex;
+  /*flex-direction: column;*/ /* 雖然是直書，但物理上我們是將「上層區」和「下層區」垂直堆疊 */
+  flex-direction: row;     /* 上下分層 (Top / Bottom) */
+  align-items: center;    /* 左右置中對齊 */
+  justify-content: center;
+  gap: 20px;               /* 這是「上層」跟「下層」之間的距離，可以設大一點 */
+}
+
+.roster-row {
+  display: flex;
+  flex-direction: row-reverse; /* 直書由右至左，所以 Row 要反向或依需求調整 */
+  justify-content: center;
+  gap: 8px; /* 名字之間的間距 */
+  margin-left: 10px; /* 上下排之間的間距 (因為是直書，margin-left 是物理上的左邊/下方) */
+}
+
+.name-group {
+  display: flex;
+  flex-direction: column;  /* ★★★ 關鍵：這讓名字左右並排 ★★★ */
+  justify-content: center;
+  align-items: center;
+  /* gap 由 HTML 動態綁定 */
+}
+
+.roster-name {
+  text-orientation: upright;
+  /*font-weight: bold;*/
+  white-space: nowrap;
+  line-height: 1.2;
+  font-family: 'Kaiti', serif;
+  /* 確保名字本身不會佔據過多寬度導致間距看起來很大 */
+  width: fit-content;
+  height:200px;
+}
+
+
+/* 選取框 */
+.selection-border {
+  position: absolute; top: -4px; left: -4px; right: -4px; bottom: -4px;
+  border: 2px solid var(--selection-color); pointer-events: none; z-index: 100;
+}
+
+.resize-handle {
+  position: absolute; width: 10px; height: 10px; background: white;
+  border: 2px solid var(--selection-color); border-radius: 50%;
+}
+.top-left { top: -6px; left: -6px; } .top-right { top: -6px; right: -6px; }
+.bottom-left { bottom: -6px; left: -6px; } .bottom-right { bottom: -6px; right: -6px; }
+
+.x-small { font-size: 0.7rem; } .ls-1 { letter-spacing: 1px; }
+.bg-gradient-primary { background: linear-gradient(135deg, #0d6efd 0%, #0043a8 100%); }
+.bg-gradient-dark { background: linear-gradient(135deg, #212529 0%, #000000 100%); }
+
+.page-info-badge {
+  background: rgba(255,255,255,0.9); padding: 5px 15px; border-radius: 20px; font-weight: bold; color: #333;
+}
+
+/* Print Mode */
+@media print {
+  app-floating-widget, .canvas-area, .page-info-badge { display: none !important; }
+  :host { display: block; background: white; }
+
+  .tablet-paper {
+    position: relative !important;
+    margin: 0;
+    page-break-after: always; /* 強制分頁 */
+    box-shadow: none !important; background: transparent !important;
+    width: 100% !important; height: 100% !important;
+    -webkit-print-color-adjust: exact; print-color-adjust: exact;
+  }
+  .tablet-paper:last-child { page-break-after: auto; }
+
+  .paper-size-label, .selection-border { display: none; }
+
+  /* 確保背景圖列印 */
+  img.bg-image-layer {
+    -webkit-print-color-adjust: exact; print-color-adjust: exact;
+    display: block !important;
+  }
+}
+
+.resizable-box {
+  width: 300px;
+  height: 200px;
+  border: 1px solid #ccc;
+
+  /* 關鍵屬性 */
+  resize: both; /* 允許水平和垂直調整 (或是 horizontal, vertical) */
+  overflow: auto; /* 必須設定 overflow (非 visible) resize 才會生效 */
+
+  /* 選用：限制最小最大尺寸 */
+  min-width: 100px;
+  min-height: 100px;
+}
+
+
+.combined-vertical-mode {
+  writing-mode: vertical-rl; /* 設定為直排 */
+  font-family: "KaiTi", "BiauKai", serif;
+  font-size: 48px;
+  font-weight: bold;
+  letter-spacing: 0.1em;
+  /* 為了讓排版置中好看，可以加這行 */
+  align-items: center;
+}
+
+.combined {
+  /* --- 關鍵修改 --- */
+
+  /* 1. 取消原本的擠壓設定 */
+  text-combine-upright: none;
+
+  /* 2. 將這三個字改回「橫向排版」 */
+  writing-mode: horizontal-tb;
+
+  /* 3. 讓它變成一個區塊，這樣字體才會撐開空間，不會擠在一起 */
+  display: inline-block;
+
+  /* 4. (選用) 調整它跟下方直書文字的對齊方式 */
+  vertical-align: middle;
+
+  /* 5. (選用) 如果希望字與字之間稍微寬鬆一點 */
+  letter-spacing: 0.05em;
+}
+
+.combined-small {
+  font-size: 32px !important;
+}
+
+.auto-wrap-text {
+  /* 1. 設定為直書模式 */
+  writing-mode: vertical-rl;
+  text-orientation: upright; /* 讓文字直立 */
+
+  /* 2. 關鍵：限制最大高度 */
+  /* 設定為 8em 代表大約 8 個字的高度，超過就會自動換行 */
+  max-height: 8em;
+
+  /* 3. 關鍵：允許換行 */
+  white-space: normal; /* 或 pre-wrap */
+
+  /* 4. 調整換行的方向與對齊 (選用) */
+  display: inline-block; /* 讓容器隨內容撐開 */
+  word-break: break-all; /* 確保長單字或連續文字也能強制切斷換行 */
+}
+
+.ancestor-wrapper {
+    /* 重置為橫向流，這樣 column 才會是真正的上下堆疊 */
+    writing-mode: horizontal-tb;
+    display: flex;
+    flex-direction: column;
+    align-items: center; /* 水平置中 */
+    justify-content: flex-start;
+    width: fit-content;
+}
+
+.main-name {
+    line-height: 1.2;
+    /* 保持大字 */
+}
+
+.sub-text {
+    font-size: 0.6em; /* 縮小字體 */
+    line-height: 1.2;
+    margin-top: 4px; /* 與上方林張的間距 */
+    white-space: nowrap; /* 避免自動換行 */
+    writing-mode:vertical-rl
+}

web/admin/item/jquery-ui/AUTHORS.txt

@@ -0,0 +1,384 @@
+Authors ordered by first contribution
+A list of current team members is available at https://jqueryui.com/about
+
+Paul Bakaus <paul.bakaus@gmail.com>
+Richard Worth <rdworth@gmail.com>
+Yehuda Katz <wycats@gmail.com>
+Sean Catchpole <sean@sunsean.com>
+John Resig <jeresig@gmail.com>
+Tane Piper <piper.tane@gmail.com>
+Dmitri Gaskin <dmitrig01@gmail.com>
+Klaus Hartl <klaus.hartl@gmail.com>
+Stefan Petre <stefan.petre@gmail.com>
+Gilles van den Hoven <gilles@webunity.nl>
+Micheil Bryan Smith <micheil@brandedcode.com>
+Jörn Zaefferer <joern.zaefferer@gmail.com>
+Marc Grabanski <m@marcgrabanski.com>
+Keith Wood <kbwood@iinet.com.au>
+Brandon Aaron <brandon.aaron@gmail.com>
+Scott González <scott.gonzalez@gmail.com>
+Eduardo Lundgren <eduardolundgren@gmail.com>
+Aaron Eisenberger <aaronchi@gmail.com>
+Joan Piedra <theneojp@gmail.com>
+Bruno Basto <b.basto@gmail.com>
+Remy Sharp <remy@leftlogic.com>
+Bohdan Ganicky <bohdan.ganicky@gmail.com>
+David Bolter <david.bolter@gmail.com>
+Chi Cheng <cloudream@gmail.com>
+Ca-Phun Ung <pazu2k@gmail.com>
+Ariel Flesler <aflesler@gmail.com>
+Maggie Wachs <maggie@filamentgroup.com>
+Scott Jehl <scottjehl@gmail.com>
+Todd Parker <todd@filamentgroup.com>
+Andrew Powell <andrew@shellscape.org>
+Brant Burnett <btburnett3@gmail.com>
+Douglas Neiner <doug@dougneiner.com>
+Paul Irish <paul.irish@gmail.com>
+Ralph Whitbeck <ralph.whitbeck@gmail.com>
+Thibault Duplessis <thibault.duplessis@gmail.com>
+Dominique Vincent <dominique.vincent@toitl.com>
+Jack Hsu <jack.hsu@gmail.com>
+Adam Sontag <ajpiano@ajpiano.com>
+Carl Fürstenberg <carl@excito.com>
+Kevin Dalman <development@allpro.net>
+Alberto Fernández Capel <afcapel@gmail.com>
+Jacek Jędrzejewski (https://jacek.jedrzejewski.name)
+Ting Kuei <ting@kuei.com>
+Samuel Cormier-Iijima <sam@chide.it>
+Jon Palmer <jonspalmer@gmail.com>
+Ben Hollis <bhollis@amazon.com>
+Justin MacCarthy <Justin@Rubystars.biz>
+Eyal Kobrigo <kobrigo@hotmail.com>
+Tiago Freire <tiago.freire@gmail.com>
+Diego Tres <diegotres@gmail.com>
+Holger Rüprich <holger@rueprich.de>
+Ziling Zhao <zilingzhao@gmail.com>
+Mike Alsup <malsup@gmail.com>
+Robson Braga Araujo <robsonbraga@gmail.com>
+Pierre-Henri Ausseil <ph.ausseil@gmail.com>
+Christopher McCulloh <cmcculloh@gmail.com>
+Andrew Newcomb <ext.github@preceptsoftware.co.uk>
+Lim Chee Aun <cheeaun@gmail.com>
+Jorge Barreiro <yortx.barry@gmail.com>
+Daniel Steigerwald <daniel@steigerwald.cz>
+John Firebaugh <john_firebaugh@bigfix.com>
+John Enters <github@darkdark.net>
+Andrey Kapitcyn <ru.m157y@gmail.com>
+Dmitry Petrov <dpetroff@gmail.com>
+Eric Hynds <eric@hynds.net>
+Chairat Sunthornwiphat <pipo@sixhead.com>
+Josh Varner <josh.varner@gmail.com>
+Stéphane Raimbault <stephane.raimbault@gmail.com>
+Jay Merrifield <fracmak@gmail.com>
+J. Ryan Stinnett <jryans@gmail.com>
+Peter Heiberg <peter@heiberg.se>
+Alex Dovenmuehle <adovenmuehle@gmail.com>
+Jamie Gegerson <git@jamiegegerson.com>
+Raymond Schwartz <skeetergraphics@gmail.com>
+Phillip Barnes <philbar@gmail.com>
+Kyle Wilkinson <kai@wikyd.org>
+Khaled AlHourani <me@khaledalhourani.com>
+Marian Rudzynski <mr@impaled.org>
+Jean-Francois Remy <jeff@melix.org>
+Doug Blood <dougblood@gmail.com>
+Filippo Cavallarin <filippo.cavallarin@codseq.it>
+Heiko Henning <heiko@thehennings.ch>
+Aliaksandr Rahalevich <saksmlz@gmail.com>
+Mario Visic <mario@mariovisic.com>
+Xavi Ramirez <xavi.rmz@gmail.com>
+Max Schnur <max.schnur@gmail.com>
+Saji Nediyanchath <saji89@gmail.com>
+Corey Frang <gnarf37@gmail.com>
+Aaron Peterson <aaronp123@yahoo.com>
+Ivan Peters <ivan@ivanpeters.com>
+Mohamed Cherif Bouchelaghem <cherifbouchelaghem@yahoo.fr>
+Marcos Sousa <falecomigo@marcossousa.com>
+Michael DellaNoce <mdellanoce@mailtrust.com>
+George Marshall <echosx@gmail.com>
+Tobias Brunner <tobias@strongswan.org>
+Martin Solli <msolli@gmail.com>
+David Petersen <public@petersendidit.com>
+Dan Heberden <danheberden@gmail.com>
+William Kevin Manire <williamkmanire@gmail.com>
+Gilmore Davidson <gilmoreorless@gmail.com>
+Michael Wu <michaelmwu@gmail.com>
+Adam Parod <mystic414@gmail.com>
+Guillaume Gautreau <guillaume+github@ghusse.com>
+Marcel Toele <EleotleCram@gmail.com>
+Dan Streetman <ddstreet@ieee.org>
+Matt Hoskins <matt@nipltd.com>
+Giovanni Giacobbi <giovanni@giacobbi.net>
+Kyle Florence <kyle.florence@gmail.com>
+Pavol Hluchý <lopo@losys.sk>
+Hans Hillen <hans.hillen@gmail.com>
+Mark Johnson <virgofx@live.com>
+Trey Hunner <treyhunner@gmail.com>
+Shane Whittet <whittet@gmail.com>
+Edward A Faulkner <ef@alum.mit.edu>
+Adam Baratz <adam@adambaratz.com>
+Kato Kazuyoshi <kato.kazuyoshi@gmail.com>
+Eike Send <eike.send@gmail.com>
+Kris Borchers <kris.borchers@gmail.com>
+Eddie Monge <eddie@eddiemonge.com>
+Israel Tsadok <itsadok@gmail.com>
+Carson McDonald <carson@ioncannon.net>
+Jason Davies <jason@jasondavies.com>
+Garrison Locke <gplocke@gmail.com>
+David Murdoch <david@davidmurdoch.com>
+Benjamin Scott Boyle <benjamins.boyle@gmail.com>
+Jesse Baird <jebaird@gmail.com>
+Jonathan Vingiano <jvingiano@gmail.com>
+Dylan Just <dev@ephox.com>
+Hiroshi Tomita <tomykaira@gmail.com>
+Glenn Goodrich <glenn.goodrich@gmail.com>
+Tarafder Ashek-E-Elahi <mail.ashek@gmail.com>
+Ryan Neufeld <ryan@neufeldmail.com>
+Marc Neuwirth <marc.neuwirth@gmail.com>
+Philip Graham <philip.robert.graham@gmail.com>
+Benjamin Sterling <benjamin.sterling@kenzomedia.com>
+Wesley Walser <waw325@gmail.com>
+Kouhei Sutou <kou@clear-code.com>
+Karl Kirch <karlkrch@gmail.com>
+Chris Kelly <ckdake@ckdake.com>
+Jason Oster <jay@kodewerx.org>
+Felix Nagel <info@felixnagel.com>
+Alexander Polomoshnov <alex.polomoshnov@gmail.com>
+David Leal <dgleal@gmail.com>
+Igor Milla <igor.fsp.milla@gmail.com>
+Dave Methvin <dave.methvin@gmail.com>
+Florian Gutmann <f.gutmann@chronimo.com>
+Marwan Al Jubeh <marwan.aljubeh@gmail.com>
+Milan Broum <midlis@googlemail.com>
+Sebastian Sauer <info@dynpages.de>
+Gaëtan Muller <m.gaetan89@gmail.com>
+Michel Weimerskirch <michel@weimerskirch.net>
+William Griffiths <william@ycymro.com>
+Stojce Slavkovski <stojce@gmail.com>
+David Soms <david.soms@gmail.com>
+David De Sloovere <david.desloovere@outlook.com>
+Michael P. Jung <michael.jung@terreon.de>
+Shannon Pekary <spekary@gmail.com>
+Dan Wellman <danwellman@hotmail.com>
+Matthew Edward Hutton <meh@corefiling.co.uk>
+James Khoury <james@jameskhoury.com>
+Rob Loach <robloach@gmail.com>
+Alberto Monteiro <betimbrasil@gmail.com>
+Alex Rhea <alex.rhea@gmail.com>
+Krzysztof Rosiński <rozwell69@gmail.com>
+Ryan Olton <oltonr@gmail.com>
+Genie <386@mail.com>
+Rick Waldron <waldron.rick@gmail.com>
+Ian Simpson <spoonlikesham@gmail.com>
+Lev Kitsis <spam4lev@gmail.com>
+TJ VanToll <tj.vantoll@gmail.com>
+Justin Domnitz <jdomnitz@gmail.com>
+Douglas Cerna <douglascerna@yahoo.com>
+Bert ter Heide <bertjh@hotmail.com>
+Jasvir Nagra <jasvir@gmail.com>
+Yuriy Khabarov <13real008@gmail.com>
+Harri Kilpiö <harri.kilpio@gmail.com>
+Lado Lomidze <lado.lomidze@gmail.com>
+Amir E. Aharoni <amir.aharoni@mail.huji.ac.il>
+Simon Sattes <simon.sattes@gmail.com>
+Jo Liss <joliss42@gmail.com>
+Guntupalli Karunakar <karunakarg@yahoo.com>
+Shahyar Ghobadpour <shahyar@gmail.com>
+Lukasz Lipinski <uzza17@gmail.com>
+Timo Tijhof <krinklemail@gmail.com>
+Jason Moon <jmoon@socialcast.com>
+Martin Frost <martinf55@hotmail.com>
+Eneko Illarramendi <eneko@illarra.com>
+EungJun Yi <semtlenori@gmail.com>
+Courtland Allen <courtlandallen@gmail.com>
+Viktar Varvanovich <non4eg@gmail.com>
+Danny Trunk <dtrunk90@gmail.com>
+Pavel Stetina <pavel.stetina@nangu.tv>
+Michael Stay <metaweta@gmail.com>
+Steven Roussey <sroussey@gmail.com>
+Michael Hollis <hollis21@gmail.com>
+Lee Rowlands <lee.rowlands@previousnext.com.au>
+Timmy Willison <timmywillisn@gmail.com>
+Karl Swedberg <kswedberg@gmail.com>
+Baoju Yuan <the_guy_1987@hotmail.com>
+Maciej Mroziński <maciej.k.mrozinski@gmail.com>
+Luis Dalmolin <luis.nh@gmail.com>
+Mark Aaron Shirley <maspwr@gmail.com>
+Martin Hoch <martin@fidion.de>
+Jiayi Yang <tr870829@gmail.com>
+Philipp Benjamin Köppchen <xgxtpbk@gws.ms>
+Sindre Sorhus <sindresorhus@gmail.com>
+Bernhard Sirlinger <bernhard.sirlinger@tele2.de>
+Jared A. Scheel <jared@jaredscheel.com>
+Rafael Xavier de Souza <rxaviers@gmail.com>
+John Chen <zhang.z.chen@intel.com>
+Robert Beuligmann <robertbeuligmann@gmail.com>
+Dale Kocian <dale.kocian@gmail.com>
+Mike Sherov <mike.sherov@gmail.com>
+Andrew Couch <andy@couchand.com>
+Marc-Andre Lafortune <github@marc-andre.ca>
+Nate Eagle <nate.eagle@teamaol.com>
+David Souther <davidsouther@gmail.com>
+Mathias Stenbom <mathias@stenbom.com>
+Sergey Kartashov <ebishkek@yandex.ru>
+Avinash R <nashpapa@gmail.com>
+Ethan Romba <ethanromba@gmail.com>
+Cory Gackenheimer <cory.gack@gmail.com>
+Juan Pablo Kaniefsky <jpkaniefsky@gmail.com>
+Roman Salnikov <bardt.dz@gmail.com>
+Anika Henke <anika@selfthinker.org>
+Samuel Bovée <samycookie2000@yahoo.fr>
+Fabrício Matté <ult_combo@hotmail.com>
+Viktor Kojouharov <vkojouharov@gmail.com>
+Pawel Maruszczyk (http://hrabstwo.net)
+Pavel Selitskas <p.selitskas@gmail.com>
+Bjørn Johansen <post@bjornjohansen.no>
+Matthieu Penant <thieum22@hotmail.com>
+Dominic Barnes <dominic@dbarnes.info>
+David Sullivan <david.sullivan@gmail.com>
+Thomas Jaggi <thomas@responsive.ch>
+Vahid Sohrabloo <vahid4134@gmail.com>
+Travis Carden <travis.carden@gmail.com>
+Bruno M. Custódio <bruno@brunomcustodio.com>
+Nathanael Silverman <nathanael.silverman@gmail.com>
+Christian Wenz <christian@wenz.org>
+Steve Urmston <steve@urm.st>
+Zaven Muradyan <megalivoithos@gmail.com>
+Woody Gilk <shadowhand@deviantart.com>
+Zbigniew Motyka <zbigniew.motyka@gmail.com>
+Suhail Alkowaileet <xsoh.k7@gmail.com>
+Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
+David Hansen <hansede@gmail.com>
+Brian Grinstead <briangrinstead@gmail.com>
+Christian Klammer <christian314159@gmail.com>
+Steven Luscher <jquerycla@steveluscher.com>
+Gan Eng Chin <engchin.gan@gmail.com>
+Gabriel Schulhof <gabriel.schulhof@intel.com>
+Alexander Schmitz <arschmitz@gmail.com>
+Vilhjálmur Skúlason <vis@dmm.is>
+Siebrand Mazeland <siebrand@kitano.nl>
+Mohsen Ekhtiari <mohsenekhtiari@yahoo.com>
+Pere Orga <gotrunks@gmail.com>
+Jasper de Groot <mail@ugomobi.com>
+Stephane Deschamps <stephane.deschamps@gmail.com>
+Jyoti Deka <dekajp@gmail.com>
+Andrei Picus <office.nightcrawler@gmail.com>
+Ondrej Novy <novy@ondrej.org>
+Jacob McCutcheon <jacob.mccutcheon@gmail.com>
+Monika Piotrowicz <monika.piotrowicz@gmail.com>
+Imants Horsts <imants.horsts@inbox.lv>
+Eric Dahl <eric.c.dahl@gmail.com>
+Dave Stein <dave@behance.com>
+Dylan Barrell <dylan@barrell.com>
+Daniel DeGroff <djdegroff@gmail.com>
+Michael Wiencek <mwtuea@gmail.com>
+Thomas Meyer <meyertee@gmail.com>
+Ruslan Yakhyaev <ruslan@ruslan.io>
+Brian J. Dowling <bjd-dev@simplicity.net>
+Ben Higgins <ben@extrahop.com>
+Yermo Lamers <yml@yml.com>
+Patrick Stapleton <github@gdi2290.com>
+Trisha Crowley <trisha.crowley@gmail.com>
+Usman Akeju <akeju00+github@gmail.com>
+Rodrigo Menezes <rod333@gmail.com>
+Jacques Perrault <jacques_perrault@us.ibm.com>
+Frederik Elvhage <frederik.elvhage@googlemail.com>
+Will Holley <willholley@gmail.com>
+Uri Gilad <antishok@gmail.com>
+Richard Gibson <richard.gibson@gmail.com>
+Simen Bekkhus <sbekkhus91@gmail.com>
+Chen Eshchar <eshcharc@gmail.com>
+Bruno Pérel <brunoperel@gmail.com>
+Mohammed Alshehri <m@dralshehri.com>
+Lisa Seacat DeLuca <ldeluca@us.ibm.com>
+Anne-Gaelle Colom <coloma@westminster.ac.uk>
+Adam Foster <slimfoster@gmail.com>
+Luke Page <luke.a.page@gmail.com>
+Daniel Owens <daniel@matchstickmixup.com>
+Michael Orchard <morchard@scottlogic.co.uk>
+Marcus Warren <marcus@envoke.com>
+Nils Heuermann <nils@world-of-scripts.de>
+Marco Ziech <marco@ziech.net>
+Patricia Juarez <patrixd@gmail.com>
+Ben Mosher <me@benmosher.com>
+Ablay Keldibek <atomio.ak@gmail.com>
+Thomas Applencourt <thomas.applencourt@irsamc.ups-tlse.fr>
+Jiabao Wu <jiabao.foss@gmail.com>
+Eric Lee Carraway <github@ericcarraway.com>
+Victor Homyakov <vkhomyackov@gmail.com>
+Myeongjin Lee <aranet100@gmail.com>
+Liran Sharir <lsharir@gmail.com>
+Weston Ruter <weston@xwp.co>
+Mani Mishra <manimishra902@gmail.com>
+Hannah Methvin <hannahmethvin@gmail.com>
+Leonardo Balter <leonardo.balter@gmail.com>
+Benjamin Albert <benjamin_a5@yahoo.com>
+Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
+Alyosha Pushak <alyosha.pushak@gmail.com>
+Fahad Ahmad <fahadahmad41@hotmail.com>
+Matt Brundage <github@mattbrundage.com>
+Francesc Baeta <francesc.baeta@gmail.com>
+Piotr Baran <piotros@wp.pl>
+Mukul Hase <mukulhase@gmail.com>
+Konstantin Dinev <kdinev@mail.bw.edu>
+Rand Scullard <rand@randscullard.com>
+Dan Strohl <dan@wjcg.net>
+Maksim Ryzhikov <rv.maksim@gmail.com>
+Amine HADDAD <haddad@allegorie.tv>
+Amanpreet Singh <apsdehal@gmail.com>
+Alexey Balchunas <bleshik@gmail.com>
+Peter Kehl <peter.kehl@gmail.com>
+Peter Dave Hello <hsu@peterdavehello.org>
+Johannes Schäfer <johnschaefer@gmx.de>
+Ville Skyttä <ville.skytta@iki.fi>
+Ryan Oriecuia <ryan.oriecuia@visioncritical.com>
+Sergei Ratnikov <sergeir82@gmail.com>
+milk54 <milk851@gmail.com>
+Evelyn Masso <evoutofambit@gmail.com>
+Robin <mail@robin-fowler.com>
+Simon Asika <asika32764@gmail.com>
+Kevin Cupp <kevin.cupp@gmail.com>
+Jeremy Mickelson <Jeremy.Mickelson@gmail.com>
+Kyle Rosenberg <kyle.rosenberg@gmail.com>
+Petri Partio <petri.partio@gmail.com>
+pallxk <github@pallxk.com>
+Luke Brookhart <luke@onjax.com>
+claudi <hirt-claudia@gmx.de>
+Eirik Sletteberg <eiriksletteberg@gmail.com>
+Albert Johansson <albert@intervaro.se>
+A. Wells <borgboyone@users.noreply.github.com>
+Robert Brignull <robertbrignull@gmail.com>
+Horus68 <pauloizidoro@gmail.com>
+Maksymenkov Eugene <foatei@gmail.com>
+OskarNS <soerensen.oskar@gmail.com>
+Gez Quinn <holla@gezquinn.design>
+jigar gala <jigar.gala140291@gmail.com>
+Florian Wegscheider <flo.wegscheider@gmail.com>
+Fatér Zsolt <fater.zsolt@gmail.com>
+Szabolcs Szabolcsi-Toth <nec@shell8.net>
+Jérémy Munsch <github@jeremydev.ovh>
+Hrvoje Novosel <hrvoje.novosel@gmail.com>
+Paul Capron <PaulCapron@users.noreply.github.com>
+Micah Miller <mikhey@runbox.com>
+sakshi87 <53863764+sakshi87@users.noreply.github.com>
+Mikolaj Wolicki <wolicki.mikolaj@gmail.com>
+Patrick McKay <patrick.mckay@vumc.org>
+c-lambert <58025159+c-lambert@users.noreply.github.com>
+Josep Sanz <josepsanzcamp@gmail.com>
+Ben Mullins <benm@umich.edu>
+Christian Oliff <christianoliff@pm.me>
+dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
+Adam Lidén Hällgren <adamlh92@gmail.com>
+James Hinderks <hinderks@gmail.com>
+Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com>
+Matías Cánepa <matias.canepa@gmail.com>
+Ashish Kurmi <100655670+boahc077@users.noreply.github.com>
+DeerBear <andrea.raimondi@gmail.com>
+Дилян Палаузов <dpa-github@aegee.org>
+Kenneth DeBacker <kcdebacker@gmail.com>
+Timo Tijhof <krinkle@fastmail.com>
+Timmy Willison <timmywil@users.noreply.github.com>
+divdeploy <166095818+divdeploy@users.noreply.github.com>
+mark van tilburg <markvantilburg@gmail.com>
+Ralf Koller <1665422+rpkoller@users.noreply.github.com>
+Porter Clevidence <116387727+porterclev@users.noreply.github.com>
+Daniel García <93217193+Daniel-Garmig@users.noreply.github.com>

web/admin/item/jquery-ui/LICENSE.txt

@@ -0,0 +1,43 @@
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/
+
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/jquery/jquery-ui
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====
+
+Copyright and related rights for sample code are waived via CC0. Sample
+code is defined as all source code contained within the demos directory.
+
+CC0: http://creativecommons.org/publicdomain/zero/1.0/
+
+====
+
+All files located in the node_modules and external directories are
+externally maintained libraries used by this software which have their
+own licenses; we recommend you read them, as their terms may differ from
+the terms above.

web/admin/item/jquery-ui/index.html

@@ -0,0 +1,503 @@
+<!doctype html>
+<html lang="us">
+<head>
+	<meta charset="utf-8">
+	<title>jQuery UI Example Page</title>
+	<link href="jquery-ui.css" rel="stylesheet">
+	<style>
+	body{
+		font-family: "Trebuchet MS", sans-serif;
+		margin: 50px;
+	}
+	.demoHeaders {
+		margin-top: 2em;
+	}
+	#dialog-link {
+		padding: .4em 1em .4em 20px;
+		text-decoration: none;
+		position: relative;
+	}
+	#dialog-link span.ui-icon {
+		margin: 0 5px 0 0;
+		position: absolute;
+		left: .2em;
+		top: 50%;
+		margin-top: -8px;
+	}
+	#icons {
+		margin: 0;
+		padding: 0;
+	}
+	#icons li {
+		margin: 2px;
+		position: relative;
+		padding: 4px 0;
+		cursor: pointer;
+		float: left;
+		list-style: none;
+	}
+	#icons span.ui-icon {
+		float: left;
+		margin: 0 4px;
+	}
+	.fakewindowcontain .ui-widget-overlay {
+		position: absolute;
+	}
+	select {
+		width: 200px;
+	}
+	</style>
+</head>
+<body>
+
+<h1>Welcome to jQuery UI!</h1>
+
+<div class="ui-widget">
+	<p>This page demonstrates the widgets and theme you selected in Download Builder. Please make sure you are using them with a compatible jQuery version.</p>
+</div>
+
+<h1>YOUR COMPONENTS:</h1>
+
+<!-- Accordion -->
+<h2 class="demoHeaders">Accordion</h2>
+<div id="accordion">
+	<h3>First</h3>
+	<div>Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.</div>
+	<h3>Second</h3>
+	<div>Phasellus mattis tincidunt nibh.</div>
+	<h3>Third</h3>
+	<div>Nam dui erat, auctor a, dignissim quis.</div>
+</div>
+
+<!-- Autocomplete -->
+<h2 class="demoHeaders">Autocomplete</h2>
+<div>
+	<input id="autocomplete" title="type &quot;a&quot;">
+</div>
+
+<!-- Button -->
+<h2 class="demoHeaders">Button</h2>
+<button id="button">A button element</button>
+<button id="button-icon">An icon-only button</button>
+
+<!-- Checkboxradio -->
+<h2 class="demoHeaders">Checkboxradio</h2>
+<form style="margin-top: 1em;">
+	<div id="radioset">
+		<input type="radio" id="radio1" name="radio"><label for="radio1">Choice 1</label>
+		<input type="radio" id="radio2" name="radio" checked="checked"><label for="radio2">Choice 2</label>
+		<input type="radio" id="radio3" name="radio"><label for="radio3">Choice 3</label>
+	</div>
+</form>
+
+<!-- Controlgroup -->
+<h2 class="demoHeaders">Controlgroup</h2>
+<fieldset>
+	<legend>Rental Car</legend>
+	<div id="controlgroup">
+		<select id="car-type">
+			<option>Compact car</option>
+			<option>Midsize car</option>
+			<option>Full size car</option>
+			<option>SUV</option>
+			<option>Luxury</option>
+			<option>Truck</option>
+			<option>Van</option>
+		</select>
+		<label for="transmission-standard">Standard</label>
+		<input type="radio" name="transmission" id="transmission-standard">
+		<label for="transmission-automatic">Automatic</label>
+		<input type="radio" name="transmission" id="transmission-automatic">
+		<label for="insurance">Insurance</label>
+		<input type="checkbox" name="insurance" id="insurance">
+		<label for="horizontal-spinner" class="ui-controlgroup-label"># of cars</label>
+		<input id="horizontal-spinner" class="ui-spinner-input">
+		<button>Book Now!</button>
+	</div>
+</fieldset>
+
+<!-- Tabs -->
+<h2 class="demoHeaders">Tabs</h2>
+<div id="tabs">
+	<ul>
+		<li><a href="#tabs-1">First</a></li>
+		<li><a href="#tabs-2">Second</a></li>
+		<li><a href="#tabs-3">Third</a></li>
+	</ul>
+	<div id="tabs-1">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</div>
+	<div id="tabs-2">Phasellus mattis tincidunt nibh. Cras orci urna, blandit id, pretium vel, aliquet ornare, felis. Maecenas scelerisque sem non nisl. Fusce sed lorem in enim dictum bibendum.</div>
+	<div id="tabs-3">Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.</div>
+</div>
+
+<h2 class="demoHeaders">Dialog</h2>
+<p>
+	<button id="dialog-link" class="ui-button ui-corner-all ui-widget">
+		<span class="ui-icon ui-icon-newwin"></span>Open Dialog
+	</button>
+</p>
+
+<h2 class="demoHeaders">Overlay and Shadow Classes</h2>
+<div style="position: relative; width: 96%; height: 200px; padding:1% 2%; overflow:hidden;" class="fakewindowcontain">
+	<p>Lorem ipsum dolor sit amet,  Nulla nec tortor. Donec id elit quis purus consectetur consequat. </p><p>Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. </p><p>Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. </p><p>Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. </p><p>Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. </p><p>Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. </p>
+
+	<!-- ui-dialog -->
+	<div class="ui-widget-overlay ui-front"></div>
+	<div style="position: absolute; width: 320px; left: 50px; top: 30px; padding: 1.2em" class="ui-widget ui-front ui-widget-content ui-corner-all ui-widget-shadow">
+		Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+	</div>
+
+</div>
+
+<!-- ui-dialog -->
+<div id="dialog" title="Dialog Title">
+	<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+</div>
+
+
+<h2 class="demoHeaders">Framework Icons (content color preview)</h2>
+<ul id="icons" class="ui-widget ui-helper-clearfix">
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-n"><span class="ui-icon ui-icon-caret-1-n"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-ne"><span class="ui-icon ui-icon-caret-1-ne"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-e"><span class="ui-icon ui-icon-caret-1-e"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-se"><span class="ui-icon ui-icon-caret-1-se"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-s"><span class="ui-icon ui-icon-caret-1-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-sw"><span class="ui-icon ui-icon-caret-1-sw"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-w"><span class="ui-icon ui-icon-caret-1-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-nw"><span class="ui-icon ui-icon-caret-1-nw"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-2-n-s"><span class="ui-icon ui-icon-caret-2-n-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-2-e-w"><span class="ui-icon ui-icon-caret-2-e-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-n"><span class="ui-icon ui-icon-triangle-1-n"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-ne"><span class="ui-icon ui-icon-triangle-1-ne"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-e"><span class="ui-icon ui-icon-triangle-1-e"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-se"><span class="ui-icon ui-icon-triangle-1-se"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-s"><span class="ui-icon ui-icon-triangle-1-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-sw"><span class="ui-icon ui-icon-triangle-1-sw"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-w"><span class="ui-icon ui-icon-triangle-1-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-nw"><span class="ui-icon ui-icon-triangle-1-nw"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-2-n-s"><span class="ui-icon ui-icon-triangle-2-n-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-2-e-w"><span class="ui-icon ui-icon-triangle-2-e-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-n"><span class="ui-icon ui-icon-arrow-1-n"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-ne"><span class="ui-icon ui-icon-arrow-1-ne"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-e"><span class="ui-icon ui-icon-arrow-1-e"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-se"><span class="ui-icon ui-icon-arrow-1-se"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-s"><span class="ui-icon ui-icon-arrow-1-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-sw"><span class="ui-icon ui-icon-arrow-1-sw"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-w"><span class="ui-icon ui-icon-arrow-1-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-nw"><span class="ui-icon ui-icon-arrow-1-nw"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-n-s"><span class="ui-icon ui-icon-arrow-2-n-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-ne-sw"><span class="ui-icon ui-icon-arrow-2-ne-sw"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-e-w"><span class="ui-icon ui-icon-arrow-2-e-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-se-nw"><span class="ui-icon ui-icon-arrow-2-se-nw"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-n"><span class="ui-icon ui-icon-arrowstop-1-n"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-e"><span class="ui-icon ui-icon-arrowstop-1-e"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-s"><span class="ui-icon ui-icon-arrowstop-1-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-w"><span class="ui-icon ui-icon-arrowstop-1-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-n"><span class="ui-icon ui-icon-arrowthick-1-n"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-ne"><span class="ui-icon ui-icon-arrowthick-1-ne"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-e"><span class="ui-icon ui-icon-arrowthick-1-e"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-se"><span class="ui-icon ui-icon-arrowthick-1-se"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-s"><span class="ui-icon ui-icon-arrowthick-1-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-sw"><span class="ui-icon ui-icon-arrowthick-1-sw"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-w"><span class="ui-icon ui-icon-arrowthick-1-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-nw"><span class="ui-icon ui-icon-arrowthick-1-nw"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-n-s"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-ne-sw"><span class="ui-icon ui-icon-arrowthick-2-ne-sw"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-e-w"><span class="ui-icon ui-icon-arrowthick-2-e-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-se-nw"><span class="ui-icon ui-icon-arrowthick-2-se-nw"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-n"><span class="ui-icon ui-icon-arrowthickstop-1-n"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-e"><span class="ui-icon ui-icon-arrowthickstop-1-e"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-s"><span class="ui-icon ui-icon-arrowthickstop-1-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-w"><span class="ui-icon ui-icon-arrowthickstop-1-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-w"><span class="ui-icon ui-icon-arrowreturnthick-1-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-n"><span class="ui-icon ui-icon-arrowreturnthick-1-n"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-e"><span class="ui-icon ui-icon-arrowreturnthick-1-e"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-s"><span class="ui-icon ui-icon-arrowreturnthick-1-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-w"><span class="ui-icon ui-icon-arrowreturn-1-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-n"><span class="ui-icon ui-icon-arrowreturn-1-n"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-e"><span class="ui-icon ui-icon-arrowreturn-1-e"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-s"><span class="ui-icon ui-icon-arrowreturn-1-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-w"><span class="ui-icon ui-icon-arrowrefresh-1-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-n"><span class="ui-icon ui-icon-arrowrefresh-1-n"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-e"><span class="ui-icon ui-icon-arrowrefresh-1-e"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-s"><span class="ui-icon ui-icon-arrowrefresh-1-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-4"><span class="ui-icon ui-icon-arrow-4"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-4-diag"><span class="ui-icon ui-icon-arrow-4-diag"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-extlink"><span class="ui-icon ui-icon-extlink"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-newwin"><span class="ui-icon ui-icon-newwin"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-refresh"><span class="ui-icon ui-icon-refresh"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-shuffle"><span class="ui-icon ui-icon-shuffle"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-transfer-e-w"><span class="ui-icon ui-icon-transfer-e-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-transferthick-e-w"><span class="ui-icon ui-icon-transferthick-e-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-folder-collapsed"><span class="ui-icon ui-icon-folder-collapsed"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-folder-open"><span class="ui-icon ui-icon-folder-open"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-document"><span class="ui-icon ui-icon-document"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-document-b"><span class="ui-icon ui-icon-document-b"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-note"><span class="ui-icon ui-icon-note"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-mail-closed"><span class="ui-icon ui-icon-mail-closed"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-mail-open"><span class="ui-icon ui-icon-mail-open"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-suitcase"><span class="ui-icon ui-icon-suitcase"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-comment"><span class="ui-icon ui-icon-comment"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-person"><span class="ui-icon ui-icon-person"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-print"><span class="ui-icon ui-icon-print"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-trash"><span class="ui-icon ui-icon-trash"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-locked"><span class="ui-icon ui-icon-locked"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-unlocked"><span class="ui-icon ui-icon-unlocked"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-bookmark"><span class="ui-icon ui-icon-bookmark"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-tag"><span class="ui-icon ui-icon-tag"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-home"><span class="ui-icon ui-icon-home"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-flag"><span class="ui-icon ui-icon-flag"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-calculator"><span class="ui-icon ui-icon-calculator"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-cart"><span class="ui-icon ui-icon-cart"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-pencil"><span class="ui-icon ui-icon-pencil"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-clock"><span class="ui-icon ui-icon-clock"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-disk"><span class="ui-icon ui-icon-disk"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-calendar"><span class="ui-icon ui-icon-calendar"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-zoomin"><span class="ui-icon ui-icon-zoomin"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-zoomout"><span class="ui-icon ui-icon-zoomout"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-search"><span class="ui-icon ui-icon-search"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-wrench"><span class="ui-icon ui-icon-wrench"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-gear"><span class="ui-icon ui-icon-gear"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-heart"><span class="ui-icon ui-icon-heart"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-star"><span class="ui-icon ui-icon-star"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-link"><span class="ui-icon ui-icon-link"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-cancel"><span class="ui-icon ui-icon-cancel"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-plus"><span class="ui-icon ui-icon-plus"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-plusthick"><span class="ui-icon ui-icon-plusthick"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-minus"><span class="ui-icon ui-icon-minus"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-minusthick"><span class="ui-icon ui-icon-minusthick"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-close"><span class="ui-icon ui-icon-close"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-closethick"><span class="ui-icon ui-icon-closethick"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-key"><span class="ui-icon ui-icon-key"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-lightbulb"><span class="ui-icon ui-icon-lightbulb"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-scissors"><span class="ui-icon ui-icon-scissors"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-clipboard"><span class="ui-icon ui-icon-clipboard"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-copy"><span class="ui-icon ui-icon-copy"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-contact"><span class="ui-icon ui-icon-contact"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-image"><span class="ui-icon ui-icon-image"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-video"><span class="ui-icon ui-icon-video"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-script"><span class="ui-icon ui-icon-script"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-alert"><span class="ui-icon ui-icon-alert"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-info"><span class="ui-icon ui-icon-info"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-notice"><span class="ui-icon ui-icon-notice"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-help"><span class="ui-icon ui-icon-help"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-check"><span class="ui-icon ui-icon-check"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-bullet"><span class="ui-icon ui-icon-bullet"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-radio-off"><span class="ui-icon ui-icon-radio-off"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-radio-on"><span class="ui-icon ui-icon-radio-on"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-pin-w"><span class="ui-icon ui-icon-pin-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-pin-s"><span class="ui-icon ui-icon-pin-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-play"><span class="ui-icon ui-icon-play"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-pause"><span class="ui-icon ui-icon-pause"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-next"><span class="ui-icon ui-icon-seek-next"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-prev"><span class="ui-icon ui-icon-seek-prev"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-end"><span class="ui-icon ui-icon-seek-end"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-first"><span class="ui-icon ui-icon-seek-first"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-stop"><span class="ui-icon ui-icon-stop"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-eject"><span class="ui-icon ui-icon-eject"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-volume-off"><span class="ui-icon ui-icon-volume-off"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-volume-on"><span class="ui-icon ui-icon-volume-on"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-power"><span class="ui-icon ui-icon-power"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-signal-diag"><span class="ui-icon ui-icon-signal-diag"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-signal"><span class="ui-icon ui-icon-signal"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-battery-0"><span class="ui-icon ui-icon-battery-0"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-battery-1"><span class="ui-icon ui-icon-battery-1"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-battery-2"><span class="ui-icon ui-icon-battery-2"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-battery-3"><span class="ui-icon ui-icon-battery-3"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-plus"><span class="ui-icon ui-icon-circle-plus"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-minus"><span class="ui-icon ui-icon-circle-minus"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-close"><span class="ui-icon ui-icon-circle-close"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-e"><span class="ui-icon ui-icon-circle-triangle-e"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-s"><span class="ui-icon ui-icon-circle-triangle-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-w"><span class="ui-icon ui-icon-circle-triangle-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-n"><span class="ui-icon ui-icon-circle-triangle-n"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-e"><span class="ui-icon ui-icon-circle-arrow-e"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-s"><span class="ui-icon ui-icon-circle-arrow-s"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-w"><span class="ui-icon ui-icon-circle-arrow-w"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-n"><span class="ui-icon ui-icon-circle-arrow-n"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-zoomin"><span class="ui-icon ui-icon-circle-zoomin"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-zoomout"><span class="ui-icon ui-icon-circle-zoomout"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-check"><span class="ui-icon ui-icon-circle-check"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-plus"><span class="ui-icon ui-icon-circlesmall-plus"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-minus"><span class="ui-icon ui-icon-circlesmall-minus"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-close"><span class="ui-icon ui-icon-circlesmall-close"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-plus"><span class="ui-icon ui-icon-squaresmall-plus"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-minus"><span class="ui-icon ui-icon-squaresmall-minus"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-close"><span class="ui-icon ui-icon-squaresmall-close"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-dotted-vertical"><span class="ui-icon ui-icon-grip-dotted-vertical"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-dotted-horizontal"><span class="ui-icon ui-icon-grip-dotted-horizontal"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-vertical"><span class="ui-icon ui-icon-grip-solid-vertical"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-horizontal"><span class="ui-icon ui-icon-grip-solid-horizontal"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-gripsmall-diagonal-se"><span class="ui-icon ui-icon-gripsmall-diagonal-se"></span></li>
+	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-diagonal-se"><span class="ui-icon ui-icon-grip-diagonal-se"></span></li>
+</ul>
+
+<!-- Slider -->
+<h2 class="demoHeaders">Slider</h2>
+<div id="slider"></div>
+
+<!-- Datepicker -->
+<h2 class="demoHeaders">Datepicker</h2>
+<div id="datepicker"></div>
+
+<!-- Progressbar -->
+<h2 class="demoHeaders">Progressbar</h2>
+<div id="progressbar"></div>
+
+<!-- Progressbar -->
+<h2 class="demoHeaders">Selectmenu</h2>
+<select id="selectmenu">
+	<option>Slower</option>
+	<option>Slow</option>
+	<option selected="selected">Medium</option>
+	<option>Fast</option>
+	<option>Faster</option>
+</select>
+
+<!-- Spinner -->
+<h2 class="demoHeaders">Spinner</h2>
+<input id="spinner">
+
+<!-- Menu -->
+<h2 class="demoHeaders">Menu</h2>
+<ul style="width:100px;" id="menu">
+	<li><div>Item 1</div></li>
+	<li><div>Item 2</div></li>
+	<li><div>Item 3</div>
+		<ul>
+			<li><div>Item 3-1</div></li>
+			<li><div>Item 3-2</div></li>
+			<li><div>Item 3-3</div></li>
+			<li><div>Item 3-4</div></li>
+			<li><div>Item 3-5</div></li>
+		</ul>
+	</li>
+	<li><div>Item 4</div></li>
+	<li><div>Item 5</div></li>
+</ul>
+
+<!-- Tooltip -->
+<h2 class="demoHeaders">Tooltip</h2>
+<p id="tooltip">
+	<a href="#" title="That&apos;s what this widget is">Tooltips</a> can be attached to any element. When you hover
+the element with your mouse, the title attribute is displayed in a little box next to the element, just like a native tooltip.
+</p>
+
+<!-- Highlight / Error -->
+<h2 class="demoHeaders">Highlight / Error</h2>
+<div class="ui-widget">
+	<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px; padding: 0 .7em;">
+		<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
+		<strong>Hey!</strong> Sample ui-state-highlight style.</p>
+	</div>
+</div>
+<br>
+<div class="ui-widget">
+	<div class="ui-state-error ui-corner-all" style="padding: 0 .7em;">
+		<p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span>
+		<strong>Alert:</strong> Sample ui-state-error style.</p>
+	</div>
+</div>
+
+<script src="external/jquery/jquery.js"></script>
+<script src="jquery-ui.js"></script>
+<script>
+$( "#accordion" ).accordion();
+
+var availableTags = [
+	"ActionScript",
+	"AppleScript",
+	"Asp",
+	"BASIC",
+	"C",
+	"C++",
+	"Clojure",
+	"COBOL",
+	"ColdFusion",
+	"Erlang",
+	"Fortran",
+	"Groovy",
+	"Haskell",
+	"Java",
+	"JavaScript",
+	"Lisp",
+	"Perl",
+	"PHP",
+	"Python",
+	"Ruby",
+	"Scala",
+	"Scheme"
+];
+$( "#autocomplete" ).autocomplete({
+	source: availableTags
+});
+
+$( "#button" ).button();
+$( "#button-icon" ).button({
+	icon: "ui-icon-gear",
+	showLabel: false
+});
+
+$( "#radioset" ).controlgroup();
+
+$( "#controlgroup" ).controlgroup();
+
+$( "#tabs" ).tabs();
+
+$( "#dialog" ).dialog({
+	autoOpen: false,
+	width: 400,
+	buttons: [
+		{
+			text: "Ok",
+			click: function() {
+				$( this ).dialog( "close" );
+			}
+		},
+		{
+			text: "Cancel",
+			click: function() {
+				$( this ).dialog( "close" );
+			}
+		}
+	]
+});
+
+// Link to open the dialog
+$( "#dialog-link" ).click(function( event ) {
+	$( "#dialog" ).dialog( "open" );
+	event.preventDefault();
+});
+
+$( "#datepicker" ).datepicker({
+	inline: true
+});
+
+$( "#slider" ).slider({
+	range: true,
+	values: [ 17, 67 ]
+});
+
+$( "#progressbar" ).progressbar({
+	value: 20
+});
+
+$( "#spinner" ).spinner();
+
+$( "#menu" ).menu();
+
+$( "#tooltip" ).tooltip();
+
+$( "#selectmenu" ).selectmenu();
+
+// Hover states on the static widgets
+$( "#dialog-link, #icons li" ).hover(
+	function() {
+		$( this ).addClass( "ui-state-hover" );
+	},
+	function() {
+		$( this ).removeClass( "ui-state-hover" );
+	}
+);
+</script>
+</body>
+</html>

web/admin/item/jquery-ui/jquery-ui.structure.css

@@ -0,0 +1,863 @@
+/*!
+ * jQuery UI CSS Framework 1.14.2
+ * https://jqueryui.com
+ *
+ * Copyright OpenJS Foundation and other contributors
+ * Released under the MIT license.
+ * https://jquery.org/license
+ *
+ * https://api.jqueryui.com/category/theming/
+ */
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden {
+	display: none;
+}
+.ui-helper-hidden-accessible {
+	border: 0;
+	clip: rect(0 0 0 0);
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
+}
+.ui-helper-reset {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	line-height: 1.3;
+	text-decoration: none;
+	font-size: 100%;
+	list-style: none;
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+	content: "";
+	display: table;
+	border-collapse: collapse;
+}
+.ui-helper-clearfix:after {
+	clear: both;
+}
+.ui-helper-zfix {
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	position: absolute;
+	opacity: 0;
+}
+
+.ui-front {
+	z-index: 100;
+}
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled {
+	cursor: default !important;
+	pointer-events: none;
+}
+
+
+/* Icons
+----------------------------------*/
+.ui-icon {
+	display: inline-block;
+	vertical-align: middle;
+	margin-top: -.25em;
+	position: relative;
+	text-indent: -99999px;
+	overflow: hidden;
+	background-repeat: no-repeat;
+}
+
+.ui-widget-icon-block {
+	left: 50%;
+	margin-left: -8px;
+	display: block;
+}
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+.ui-accordion .ui-accordion-header {
+	display: block;
+	cursor: pointer;
+	position: relative;
+	margin: 2px 0 0 0;
+	padding: .5em .5em .5em .7em;
+	font-size: 100%;
+}
+.ui-accordion .ui-accordion-content {
+	padding: 1em 2.2em;
+	border-top: 0;
+	overflow: auto;
+}
+.ui-autocomplete {
+	position: absolute;
+	top: 0;
+	left: 0;
+	cursor: default;
+}
+.ui-menu {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	display: block;
+	outline: 0;
+}
+.ui-menu .ui-menu {
+	position: absolute;
+}
+.ui-menu .ui-menu-item {
+	margin: 0;
+	cursor: pointer;
+}
+.ui-menu .ui-menu-item-wrapper {
+	position: relative;
+	padding: 3px 1em 3px .4em;
+}
+.ui-menu .ui-menu-divider {
+	margin: 5px 0;
+	height: 0;
+	font-size: 0;
+	line-height: 0;
+	border-width: 1px 0 0 0;
+}
+.ui-menu .ui-state-focus,
+.ui-menu .ui-state-active {
+	margin: -1px;
+}
+
+/* icon support */
+.ui-menu-icons {
+	position: relative;
+}
+.ui-menu-icons .ui-menu-item-wrapper {
+	padding-left: 2em;
+}
+
+/* left-aligned */
+.ui-menu .ui-icon {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: .2em;
+	margin: auto 0;
+}
+
+/* right-aligned */
+.ui-menu .ui-menu-icon {
+	left: auto;
+	right: 0;
+}
+.ui-button {
+	padding: .4em 1em;
+	display: inline-block;
+	position: relative;
+	line-height: normal;
+	margin-right: .1em;
+	cursor: pointer;
+	vertical-align: middle;
+	text-align: center;
+	-webkit-user-select: none;
+	user-select: none;
+}
+
+.ui-button,
+.ui-button:link,
+.ui-button:visited,
+.ui-button:hover,
+.ui-button:active {
+	text-decoration: none;
+}
+
+/* to make room for the icon, a width needs to be set here */
+.ui-button-icon-only {
+	width: 2em;
+	box-sizing: border-box;
+	text-indent: -9999px;
+	white-space: nowrap;
+}
+
+/* no icon support for input elements */
+input.ui-button.ui-button-icon-only {
+	text-indent: 0;
+}
+
+/* button icon element(s) */
+.ui-button-icon-only .ui-icon {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	margin-top: -8px;
+	margin-left: -8px;
+}
+
+.ui-button.ui-icon-notext .ui-icon {
+	padding: 0;
+	width: 2.1em;
+	height: 2.1em;
+	text-indent: -9999px;
+	white-space: nowrap;
+
+}
+
+input.ui-button.ui-icon-notext .ui-icon {
+	width: auto;
+	height: auto;
+	text-indent: 0;
+	white-space: normal;
+	padding: .4em 1em;
+}
+
+/* workarounds */
+/* Support: Firefox 5 - 125+ */
+input.ui-button::-moz-focus-inner,
+button.ui-button::-moz-focus-inner {
+	border: 0;
+	padding: 0;
+}
+.ui-controlgroup {
+	vertical-align: middle;
+	display: inline-block;
+}
+.ui-controlgroup > .ui-controlgroup-item {
+	float: left;
+	margin-left: 0;
+	margin-right: 0;
+}
+.ui-controlgroup > .ui-controlgroup-item:focus,
+.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus {
+	z-index: 9999;
+}
+.ui-controlgroup-vertical > .ui-controlgroup-item {
+	display: block;
+	float: none;
+	width: 100%;
+	margin-top: 0;
+	margin-bottom: 0;
+	text-align: left;
+}
+.ui-controlgroup-vertical .ui-controlgroup-item {
+	box-sizing: border-box;
+}
+.ui-controlgroup .ui-controlgroup-label {
+	padding: .4em 1em;
+}
+.ui-controlgroup .ui-controlgroup-label span {
+	font-size: 80%;
+}
+.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item {
+	border-left: none;
+}
+.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item {
+	border-top: none;
+}
+.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content {
+	border-right: none;
+}
+.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content {
+	border-bottom: none;
+}
+
+/* Spinner specific style fixes */
+.ui-controlgroup-vertical .ui-spinner-input {
+	width: calc( 100% - 2.4em );
+}
+.ui-controlgroup-vertical .ui-spinner .ui-spinner-up {
+	border-top-style: solid;
+}
+
+.ui-checkboxradio-label .ui-icon-background {
+	box-shadow: inset 1px 1px 1px #ccc;
+	border-radius: .12em;
+	border: none;
+}
+.ui-checkboxradio-radio-label .ui-icon-background {
+	width: 16px;
+	height: 16px;
+	border-radius: 1em;
+	overflow: visible;
+	border: none;
+}
+.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,
+.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon {
+	background-image: none;
+	width: 8px;
+	height: 8px;
+	border-width: 4px;
+	border-style: solid;
+}
+.ui-checkboxradio-disabled {
+	pointer-events: none;
+}
+.ui-datepicker {
+	width: 17em;
+	padding: .2em .2em 0;
+	display: none;
+}
+.ui-datepicker .ui-datepicker-header {
+	position: relative;
+	padding: .2em 0;
+}
+.ui-datepicker .ui-datepicker-prev,
+.ui-datepicker .ui-datepicker-next {
+	position: absolute;
+	top: 2px;
+	width: 1.8em;
+	height: 1.8em;
+}
+.ui-datepicker .ui-datepicker-prev-hover,
+.ui-datepicker .ui-datepicker-next-hover {
+	top: 1px;
+}
+.ui-datepicker .ui-datepicker-prev {
+	left: 2px;
+}
+.ui-datepicker .ui-datepicker-next {
+	right: 2px;
+}
+.ui-datepicker .ui-datepicker-prev-hover {
+	left: 1px;
+}
+.ui-datepicker .ui-datepicker-next-hover {
+	right: 1px;
+}
+.ui-datepicker .ui-datepicker-prev span,
+.ui-datepicker .ui-datepicker-next span {
+	display: block;
+	position: absolute;
+	left: 50%;
+	margin-left: -8px;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-datepicker .ui-datepicker-title {
+	margin: 0 2.3em;
+	line-height: 1.8em;
+	text-align: center;
+}
+.ui-datepicker .ui-datepicker-title select {
+	font-size: 1em;
+	margin: 1px 0;
+}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year {
+	width: 45%;
+}
+.ui-datepicker table {
+	width: 100%;
+	font-size: .9em;
+	border-collapse: collapse;
+	margin: 0 0 .4em;
+}
+.ui-datepicker th {
+	padding: .7em .3em;
+	text-align: center;
+	font-weight: bold;
+	border: 0;
+}
+.ui-datepicker td {
+	border: 0;
+	padding: 1px;
+}
+.ui-datepicker td span,
+.ui-datepicker td a {
+	display: block;
+	padding: .2em;
+	text-align: right;
+	text-decoration: none;
+}
+.ui-datepicker .ui-datepicker-buttonpane {
+	background-image: none;
+	margin: .7em 0 0 0;
+	padding: 0 .2em;
+	border-left: 0;
+	border-right: 0;
+	border-bottom: 0;
+}
+.ui-datepicker .ui-datepicker-buttonpane button {
+	float: right;
+	margin: .5em .2em .4em;
+	cursor: pointer;
+	padding: .2em .6em .3em .6em;
+	width: auto;
+	overflow: visible;
+}
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
+	float: left;
+}
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi {
+	width: auto;
+}
+.ui-datepicker-multi .ui-datepicker-group {
+	float: left;
+}
+.ui-datepicker-multi .ui-datepicker-group table {
+	width: 95%;
+	margin: 0 auto .4em;
+}
+.ui-datepicker-multi-2 .ui-datepicker-group {
+	width: 50%;
+}
+.ui-datepicker-multi-3 .ui-datepicker-group {
+	width: 33.3%;
+}
+.ui-datepicker-multi-4 .ui-datepicker-group {
+	width: 25%;
+}
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
+	border-left-width: 0;
+}
+.ui-datepicker-multi .ui-datepicker-buttonpane {
+	clear: left;
+}
+.ui-datepicker-row-break {
+	clear: both;
+	width: 100%;
+	font-size: 0;
+}
+
+/* RTL support */
+.ui-datepicker-rtl {
+	direction: rtl;
+}
+.ui-datepicker-rtl .ui-datepicker-prev {
+	right: 2px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next {
+	left: 2px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-prev:hover {
+	right: 1px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next:hover {
+	left: 1px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane {
+	clear: right;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button {
+	float: left;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
+.ui-datepicker-rtl .ui-datepicker-group {
+	float: right;
+}
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
+	border-right-width: 0;
+	border-left-width: 1px;
+}
+
+/* Icons */
+.ui-datepicker .ui-icon {
+	display: block;
+	text-indent: -99999px;
+	overflow: hidden;
+	background-repeat: no-repeat;
+	left: .5em;
+	top: .3em;
+}
+.ui-dialog {
+	position: absolute;
+	top: 0;
+	left: 0;
+	padding: .2em;
+	outline: 0;
+}
+.ui-dialog .ui-dialog-titlebar {
+	padding: .4em 1em;
+	position: relative;
+}
+.ui-dialog .ui-dialog-title {
+	float: left;
+	margin: .1em 0;
+	white-space: nowrap;
+	width: 90%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.ui-dialog .ui-dialog-titlebar-close {
+	position: absolute;
+	right: .3em;
+	top: 50%;
+	width: 20px;
+	margin: -10px 0 0 0;
+	padding: 1px;
+	height: 20px;
+}
+.ui-dialog .ui-dialog-content {
+	position: relative;
+	border: 0;
+	padding: .5em 1em;
+	background: none;
+	overflow: auto;
+}
+.ui-dialog .ui-dialog-buttonpane {
+	text-align: left;
+	border-width: 1px 0 0 0;
+	background-image: none;
+	margin-top: .5em;
+	padding: .3em 1em .5em .4em;
+}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+	float: right;
+}
+.ui-dialog .ui-dialog-buttonpane button {
+	margin: .5em .4em .5em 0;
+	cursor: pointer;
+}
+.ui-dialog .ui-resizable-n {
+	height: 2px;
+	top: 0;
+}
+.ui-dialog .ui-resizable-e {
+	width: 2px;
+	right: 0;
+}
+.ui-dialog .ui-resizable-s {
+	height: 2px;
+	bottom: 0;
+}
+.ui-dialog .ui-resizable-w {
+	width: 2px;
+	left: 0;
+}
+.ui-dialog .ui-resizable-se,
+.ui-dialog .ui-resizable-sw,
+.ui-dialog .ui-resizable-ne,
+.ui-dialog .ui-resizable-nw {
+	width: 7px;
+	height: 7px;
+}
+.ui-dialog .ui-resizable-se {
+	right: 0;
+	bottom: 0;
+}
+.ui-dialog .ui-resizable-sw {
+	left: 0;
+	bottom: 0;
+}
+.ui-dialog .ui-resizable-ne {
+	right: 0;
+	top: 0;
+}
+.ui-dialog .ui-resizable-nw {
+	left: 0;
+	top: 0;
+}
+.ui-draggable .ui-dialog-titlebar {
+	cursor: move;
+}
+.ui-draggable-handle {
+	touch-action: none;
+}
+.ui-resizable {
+	position: relative;
+}
+.ui-resizable-handle {
+	position: absolute;
+	font-size: 0.1px;
+	display: block;
+	touch-action: none;
+}
+.ui-resizable-disabled .ui-resizable-handle,
+.ui-resizable-autohide .ui-resizable-handle {
+	display: none;
+}
+.ui-resizable-n {
+	cursor: n-resize;
+	height: 7px;
+	width: 100%;
+	top: -5px;
+	left: 0;
+}
+.ui-resizable-s {
+	cursor: s-resize;
+	height: 7px;
+	width: 100%;
+	bottom: -5px;
+	left: 0;
+}
+.ui-resizable-e {
+	cursor: e-resize;
+	width: 7px;
+	right: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-w {
+	cursor: w-resize;
+	width: 7px;
+	left: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-se {
+	cursor: se-resize;
+	width: 12px;
+	height: 12px;
+	right: 1px;
+	bottom: 1px;
+}
+.ui-resizable-sw {
+	cursor: sw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	bottom: -5px;
+}
+.ui-resizable-nw {
+	cursor: nw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	top: -5px;
+}
+.ui-resizable-ne {
+	cursor: ne-resize;
+	width: 9px;
+	height: 9px;
+	right: -5px;
+	top: -5px;
+}
+.ui-progressbar {
+	height: 2em;
+	text-align: left;
+	overflow: hidden;
+}
+.ui-progressbar .ui-progressbar-value {
+	margin: -1px;
+	height: 100%;
+}
+.ui-progressbar .ui-progressbar-overlay {
+	background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");
+	height: 100%;
+	opacity: 0.25;
+}
+.ui-progressbar-indeterminate .ui-progressbar-value {
+	background-image: none;
+}
+.ui-selectable {
+	touch-action: none;
+}
+.ui-selectable-helper {
+	position: absolute;
+	z-index: 100;
+	border: 1px dotted black;
+}
+.ui-selectmenu-menu {
+	padding: 0;
+	margin: 0;
+	position: absolute;
+	top: 0;
+	left: 0;
+	display: none;
+}
+.ui-selectmenu-menu .ui-menu {
+	overflow: auto;
+	overflow-x: hidden;
+	padding-bottom: 1px;
+}
+.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup {
+	font-size: 1em;
+	font-weight: bold;
+	line-height: 1.5;
+	padding: 2px 0.4em;
+	margin: 0.5em 0 0 0;
+	height: auto;
+	border: 0;
+}
+.ui-selectmenu-open {
+	display: block;
+}
+.ui-selectmenu-text {
+	display: block;
+	margin-right: 20px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.ui-selectmenu-button.ui-button {
+	text-align: left;
+	white-space: nowrap;
+	width: 14em;
+}
+.ui-selectmenu-icon.ui-icon {
+	float: right;
+	margin-top: 0;
+}
+.ui-slider {
+	position: relative;
+	text-align: left;
+}
+.ui-slider .ui-slider-handle {
+	position: absolute;
+	z-index: 2;
+	width: 1.2em;
+	height: 1.2em;
+	cursor: pointer;
+	touch-action: none;
+}
+.ui-slider .ui-slider-range {
+	position: absolute;
+	z-index: 1;
+	font-size: .7em;
+	display: block;
+	border: 0;
+	background-position: 0 0;
+}
+
+.ui-slider-horizontal {
+	height: .8em;
+}
+.ui-slider-horizontal .ui-slider-handle {
+	top: -.3em;
+	margin-left: -.6em;
+}
+.ui-slider-horizontal .ui-slider-range {
+	top: 0;
+	height: 100%;
+}
+.ui-slider-horizontal .ui-slider-range-min {
+	left: 0;
+}
+.ui-slider-horizontal .ui-slider-range-max {
+	right: 0;
+}
+
+.ui-slider-vertical {
+	width: .8em;
+	height: 100px;
+}
+.ui-slider-vertical .ui-slider-handle {
+	left: -.3em;
+	margin-left: 0;
+	margin-bottom: -.6em;
+}
+.ui-slider-vertical .ui-slider-range {
+	left: 0;
+	width: 100%;
+}
+.ui-slider-vertical .ui-slider-range-min {
+	bottom: 0;
+}
+.ui-slider-vertical .ui-slider-range-max {
+	top: 0;
+}
+.ui-sortable-handle {
+	touch-action: none;
+}
+.ui-spinner {
+	position: relative;
+	display: inline-block;
+	overflow: hidden;
+	padding: 0;
+	vertical-align: middle;
+}
+.ui-spinner-input {
+	border: none;
+	background: none;
+	color: inherit;
+	padding: .222em 0;
+	margin: .2em 0;
+	vertical-align: middle;
+	margin-left: .4em;
+	margin-right: 2em;
+}
+.ui-spinner-button {
+	width: 1.6em;
+	height: 50%;
+	font-size: .5em;
+	padding: 0;
+	margin: 0;
+	text-align: center;
+	position: absolute;
+	cursor: default;
+	display: block;
+	overflow: hidden;
+	right: 0;
+}
+/* more specificity required here to override default borders */
+.ui-spinner a.ui-spinner-button {
+	border-top-style: none;
+	border-bottom-style: none;
+	border-right-style: none;
+}
+.ui-spinner-up {
+	top: 0;
+}
+.ui-spinner-down {
+	bottom: 0;
+}
+.ui-tabs {
+	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+	padding: .2em;
+}
+.ui-tabs .ui-tabs-nav {
+	margin: 0;
+	padding: .2em .2em 0;
+}
+.ui-tabs .ui-tabs-nav li {
+	list-style: none;
+	float: left;
+	position: relative;
+	top: 0;
+	margin: 1px .2em 0 0;
+	border-bottom-width: 0;
+	padding: 0;
+	white-space: nowrap;
+}
+.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
+	float: left;
+	padding: .5em 1em;
+	text-decoration: none;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active {
+	margin-bottom: -1px;
+	padding-bottom: 1px;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
+.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
+.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
+	cursor: text;
+}
+.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
+	cursor: pointer;
+}
+.ui-tabs .ui-tabs-panel {
+	display: block;
+	border-width: 0;
+	padding: 1em 1.4em;
+	background: none;
+}
+.ui-tooltip {
+	padding: 8px;
+	position: absolute;
+	z-index: 9999;
+	max-width: 300px;
+}
+body .ui-tooltip {
+	border-width: 2px;
+}