Merged branch develop into master

bezzad · Feb 27, 2017 · cac3cc5 · cac3cc5
2 parents 2dbfaaa + 2fa9ea8
commit cac3cc5
Show file tree

Hide file tree

Showing 25 changed files with 937 additions and 364 deletions.
diff --git a/src/GoProject.Sample/App_Data/CasSp.sql b/src/GoProject.Sample/App_Data/CasSp.sql
@@ -0,0 +1,276 @@
+USE [CAS]
+GO
+/****** Object:  StoredProcedure [dbo].[sp_GetDiagramNodes]    Script Date: 05/12/1395 09:56:00 ق.ظ ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+	IF EXISTS ( SELECT  * FROM    sys.objects WHERE   object_id = OBJECT_ID(N'sp_GetDiagramNodes') AND type IN ( N'P', N'PC' ) ) 
+		DROP PROCEDURE [dbo].[sp_GetDiagramNodes]
+Go
+CREATE PROCEDURE [dbo].[sp_GetDiagramNodes]
+	@DiagramId VARCHAR(100)
+AS
+BEGIN
+	-- SET NOCOUNT ON added to prevent extra result sets from
+	-- interfering with SELECT statements.
+	SET NOCOUNT ON;
+
+    -- All Expense Centers Data
+	--SELECT  ec.ExpenseCenterId,
+	--		ec.[Name] ,
+	--		ec.ExpenseCenterTypeId ,
+	--		ect.Title AS ExpenseCenterTypeName,
+	--		ec.ExpenseCenterCode ,
+	--		ec.LineCode,
+	--		wtp.WorkStationToProductId,
+	--		wtp.WorkStationId,
+	--		w.Name,
+	--		wtp.ProductId,
+	--		p.ProductName,
+	--		p.group1_code,
+	--		CONVERT(BIT, CASE WHEN p.ProductName IS NULL THEN 0 ELSE 1 END) AS EndProduct,
+	--		wtp.OrderWorksatation
+	--FROM    [CAS].[dbo].[ExpenseCenter] ec
+	--		INNER JOIN [CAS].[dbo].[ExpenseCenterType] ect ON ec.ExpenseCenterTypeId = ect.ExpenseCenterTypeId
+	--		INNER JOIN dbo.WorkStationToProduct wtp ON wtp.ExpenseCenterId = ec.ExpenseCenterId
+	--		INNER JOIN dbo.WorkStation w ON w.WorkStationId = wtp.WorkStationId
+	--		Left JOIN dbo.Product p ON p.ProductId = wtp.ProductId
+	--		ORDER BY ec.ExpenseCenterId, wtp.OrderWorksatation;
+
+	DECLARE @Nodes TABLE (
+			[Key] [VARCHAR](100) NOT NULL,
+			[Category] [INT] NOT NULL,
+			[Loc] [VARCHAR](50) NULL,
+			[Text] [NVARCHAR](150) NULL,
+			[EventType] [INT] NULL,
+			[EventDimension] [INT] NULL,
+			[GatewayType] [INT] NULL,
+			[TaskType] [INT] NULL,
+			[Group] [VARCHAR](100) NULL,
+			[IsGroup] [BIT] NULL,
+			[Color] [VARCHAR](50) NULL,
+			[Size] [VARCHAR](50) NULL,
+			[IsSubProcess] [BIT] NULL,
+			[Name] [NVARCHAR](150) NULL,
+			OrderWorksatation INT NOT NULL,
+			IsInput BIT NULL,
+			ProductId INT NULL
+		)
+
+	 DECLARE @Links TABLE (
+			[From] [INT] NOT NULL,
+			[To] [INT] NOT NULL
+		)
+
+	DECLARE @PoolKey VARCHAR(100) = 'Pool_'+ @DiagramId
+	DECLARE @LaneKey VARCHAR(100) = 'Lane_'+ @DiagramId
+
+
+
+		-- Pool Node:
+		INSERT INTO @Nodes
+				( [Key] ,
+				Category ,
+				Loc ,
+				Text ,
+				EventType ,
+				EventDimension ,
+				GatewayType ,
+				TaskType ,
+				[Group] ,
+				IsGroup ,
+				Name,
+				OrderWorksatation
+				)
+		SELECT
+				@PoolKey AS [Key],
+				7 AS Category,
+				NULL AS Loc,
+				N'مرکز هزینه ' + [NAME] AS [Text],
+				NULL AS  EventType,
+				NULL AS  EventDimension,
+				NULL AS GatewayType,
+				NULL AS  TaskType,
+				NULL  AS  [Group],
+				1  AS  IsGroup,
+				'PoolNode' AS [Name],
+				0
+			FROM  dbo.ExpenseCenter
+			WHERE ExpenseCenterId = @DiagramId
+
+		-- Lane Node:
+		INSERT INTO @Nodes
+				( [Key] ,
+				Category ,
+				Loc ,
+				Text ,
+				EventType ,
+				EventDimension ,
+				GatewayType ,
+				TaskType ,
+				[Group] ,
+				IsGroup ,
+				Name,
+				OrderWorksatation
+				)
+		SELECT
+			@LaneKey AS [Key],
+			8 AS Category,
+			NULL AS Loc,
+			N'خط تولید' AS [Text],
+			NULL AS  EventType,
+			NULL AS  EventDimension,
+			NULL AS GatewayType,
+			NULL AS  TaskType,
+			@PoolKey  AS  [Group],
+			1  AS  IsGroup,
+			'LaneNode' AS [Name],
+			0
+
+
+		-- Activity Nodes:
+		INSERT INTO @Nodes
+				( [Key] ,
+				Category ,
+				Loc ,
+				Text ,
+				EventType ,
+				EventDimension ,
+				GatewayType ,
+				TaskType ,
+				[Group] ,
+				IsGroup ,
+				Name,
+				OrderWorksatation
+				)
+		SELECT 
+			CONVERT(VARCHAR(10), wtp.OrderWorksatation) + CONVERT(VARCHAR(10), wtp.WorkStationId) AS [Key],
+			1, --activity
+			NULL AS Loc,
+			w.[Name] AS [Text],
+			NULL AS EventType,
+			NULL AS EventDimension,
+			NULL AS GatewayType,
+			6 AS TaskType,
+			@LaneKey as [Group],
+			0 as IsGroup,
+			'ActivityNode' AS [Name],
+			wtp.OrderWorksatation
+		FROM    [CAS].[dbo].[ExpenseCenter] ec        
+				INNER JOIN dbo.WorkStationToProduct wtp ON wtp.ExpenseCenterId = ec.ExpenseCenterId
+				INNER JOIN dbo.WorkStation w ON w.WorkStationId = wtp.WorkStationId							
+				WHERE ec.ExpenseCenterId = @DiagramId
+				GROUP BY wtp.OrderWorksatation, CONVERT(VARCHAR(10), wtp.OrderWorksatation) + CONVERT(VARCHAR(10), wtp.WorkStationId), w.[Name]
+				ORDER BY wtp.OrderWorksatation
+
+
+		-- Event Nodes
+		INSERT INTO @Nodes
+				( [Key] ,
+				Category ,
+				Loc ,
+				Text ,
+				EventType ,
+				EventDimension ,
+				GatewayType ,
+				TaskType ,
+				[Group] ,
+				IsGroup ,
+				Name,
+				OrderWorksatation,
+				IsInput,
+				ProductId
+				)
+		SELECT  
+			wtp.WorkStationToProductId AS [Key],
+			0 AS Category,
+			NULL AS Loc,
+			p.code_name AS [Text],
+			CASE p.TypeCodeKala 
+				WHEN 0 THEN 1 -- مواد اولیه
+				WHEN 1 THEN 11 -- نیمه ساخته
+                WHEN 2 THEN	13 -- نهایی
+				ELSE 11 
+			END AS EventType,
+			CASE p.TypeCodeKala 
+				WHEN 0 THEN 1 -- مواد اولیه
+				WHEN 1 THEN 6 -- نیمه ساخته
+                WHEN 2 THEN	8 -- نهایی
+				ELSE 6 
+			END AS EventDimension,
+			NULL AS GatewayType,
+			NULL AS TaskType,
+			@LaneKey as [Group],
+			0 as IsGroup,
+			'EventNode' AS [Name],
+			wtp.OrderWorksatation,
+			CASE p.TypeCodeKala 
+				WHEN 2 THEN 0 -- محصول نهایی
+				ELSE 1
+			END AS IsInput,
+			wtp.ProductId
+		FROM    [CAS].[dbo].[ExpenseCenter] ec        
+				INNER JOIN dbo.WorkStationToProduct wtp ON wtp.ExpenseCenterId = ec.ExpenseCenterId
+				INNER JOIN dbo.WorkStation w ON w.WorkStationId = wtp.WorkStationId
+				Left JOIN [dbo].[ProductView]  p ON p.coding_main_id = wtp.ProductId
+				WHERE ec.ExpenseCenterId = @DiagramId
+				ORDER BY wtp.OrderWorksatation
+
+
+
+
+
+
+		-- Add Nodes Links
+
+		-- Input event nodes to task node and task node to output event nodes links
+		INSERT INTO @Links
+		        ( [From], [To] )
+		SELECT 
+			CASE WHEN eventNodes.IsInput = 1 then eventNodes.[Key] ELSE  taskNodes.[Key] END AS [From],
+			CASE WHEN eventNodes.IsInput = 1 then taskNodes.[Key]  ELSE eventNodes.[Key] END AS [To]
+		FROM @Nodes eventNodes 
+				INNER JOIN @Nodes taskNodes ON tasknodes.OrderWorksatation = eventNodes.OrderWorksatation
+		WHERE eventNodes.Category = 0 -- event nodes
+				AND taskNodes.Category = 1 -- activity
+		ORDER BY eventNodes.OrderWorksatation, tasknodes.OrderWorksatation
+
+		-- Output event nodes to next task nodes links
+		INSERT INTO @Links
+		        ( [From], [To] )
+		SELECT eventNodes.[Key] AS [From], taskNodes.[Key] AS [To]
+		FROM @Nodes eventNodes 
+				INNER JOIN @Nodes taskNodes ON tasknodes.OrderWorksatation = eventNodes.OrderWorksatation + 1
+		WHERE eventNodes.Category = 0 -- event nodes
+				AND taskNodes.Category = 1 -- activity
+				AND eventNodes.IsInput = 0 -- just output event nodes
+		ORDER BY eventNodes.OrderWorksatation, tasknodes.OrderWorksatation
+
+		-- Output event nodes to next task nodes links
+		INSERT INTO @Links
+		        ( [From], [To] )
+		SELECT preTasks.[Key] AS [From], nextTasks.[Key] AS [To]
+		FROM @Nodes preTasks
+			INNER JOIN @Nodes nextTasks ON nextTasks.OrderWorksatation = preTasks.OrderWorksatation + 1
+		WHERE preTasks.Category = 1 -- task nodes
+	     AND nextTasks.Category = 1 -- task nodes
+		ORDER BY preTasks.OrderWorksatation, nextTasks.OrderWorksatation
+
+
+
+		-- Get Result to Application
+
+			-- nodes
+			SELECT * FROM @Nodes
+
+
+			-- node details
+			SELECT n.[Key], pv.cod AS N'کد محصول', pv.typename AS N'نوع', pv.code_desc AS N'توضیحات'
+				FROM [dbo].[ProductView] pv
+				INNER JOIN @Nodes n ON n.ProductId = pv.coding_main_id
+
+
+			-- links			
+			SELECT * FROM @Links
+END
diff --git a/src/GoProject.Sample/App_Data/Connections.cs b/src/GoProject.Sample/App_Data/Connections.cs
@@ -2,7 +2,7 @@
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version: 4.0.30319.42000
-//     Generated at 02/22/2017 15:05:15
+//     Generated at 02/27/2017 12:09:51
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -33,5 +33,7 @@ static Connections()
 
 
 		public static AdoManager.ConnectionManager GoProjectDb { get { return ConnectionManager.Find("GoProjectDb"); } }
+
+		public static AdoManager.ConnectionManager CAS { get { return ConnectionManager.Find("CAS"); } }
 
 }
diff --git a/src/GoProject.Sample/App_Start/BundleConfig.cs b/src/GoProject.Sample/App_Start/BundleConfig.cs
@@ -11,7 +11,8 @@ public static void RegisterBundles(BundleCollection bundles)
             bundles.Add(new ScriptBundle("~/bundles/goJs").Include("~/Scripts/GoJs/go.js"));
             bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
                 "~/Scripts/jquery-{version}.js",
-                "~/Scripts/jquery-ui-{version}.js"
+                "~/Scripts/jquery-ui-{version}.js",
+                "~/Scripts/bootstrap.min.js"
                 ));
 
             bundles.Add(new ScriptBundle("~/bundles/bpmnJs").Include(