Added Eiffel to JSON mapping to

	GRID_PROPERTIES
	SHEET (WIP)
	SHEET_PROPERTIES
	SHEET_TYPE

Author: jvelilla

sheets/src/json/eg_sheets_json.e

@@ -47,7 +47,7 @@ feature -- Post
 			end
 		end
 
-feature -- 	Get
+feature -- Get
 
 	get_from_id (a_spreadsheet_id: STRING_8; a_params: detachable EG_SPREADSHEET_PARAMETERS): detachable EG_SPREADSHEET
 		note
@@ -460,6 +460,9 @@ feature {NONE} -- JSON To Eiffel
 
 	sheet_properties (a_json: JSON_VALUE): EG_SHEET_PROPERTIES
 			-- Create an object `EG_SHEET_PROPERTIES` from a json representation `a_json`.
+		local
+			l_stype: EG_SHEET_TYPE
+			l_grid_prop: EG_GRID_PROPERTIES
 		do
 			create Result
 			if attached integer_value_from_json (a_json, "sheetId") as l_sheetId then
@@ -472,19 +475,23 @@ feature {NONE} -- JSON To Eiffel
 				Result.set_index (l_index)
 			end
 			if attached string_value_from_json (a_json, "sheetType") as l_sheet_type then
+				create l_stype
 				if l_sheet_type.is_case_insensitive_equal ("GRID") then
-					Result.sheet_type.set_grid
+					l_stype.set_grid
 				elseif l_sheet_type.is_case_insensitive_equal ("OBJECT") then
-					Result.sheet_type.set_grid
+					l_stype.set_grid
 				end
+				Result.set_sheet_type (l_stype)
 			end
 			if attached {JSON_OBJECT} json_value (a_json, "gridProperties") as l_grid_properties then
+				create l_grid_prop
 				if attached integer_value_from_json (l_grid_properties, "rowCount") as l_row_count then
-					Result.grid_properties.set_row_count (l_row_count)
+					l_grid_prop.set_row_count (l_row_count)
 				end
 				if attached integer_value_from_json (l_grid_properties, "columnCount") as l_column_count then
-					Result.grid_properties.set_column_count (l_column_count)
+					l_grid_prop.set_column_count (l_column_count)
 				end
+				Result.set_grid_properties (l_grid_prop)
 			end
 			if attached boolean_value_from_json (a_json, "hidden") as l_hidden then
 				Result.set_hidden (l_hidden)

sheets/src/objects/eg_grid_properties.e

@@ -103,4 +103,18 @@ feature -- Element change
 			row_count_assigned: row_count = a_row_count
 		end
 
+feature -- Eiffel to JSON
+
+	to_json: JSON_OBJECT
+			-- JSon representation of current object.
+		do
+			create Result.make_with_capacity (6)
+			Result.put (create {JSON_NUMBER}.make_integer (row_count), "rowCount")
+			Result.put (create {JSON_NUMBER}.make_integer (column_count), "columnCount")
+			Result.put (create {JSON_NUMBER}.make_integer (frozen_row_count), "frozenRowCount")
+			Result.put (create {JSON_NUMBER}.make_integer (frozen_column_count), "frozenColumnCount")
+			Result.put (create {JSON_BOOLEAN}.make (hide_grid_lines), "hideGridlines")
+			Result.put (create {JSON_BOOLEAN}.make (row_group_control_after), "rowGroupControlAfter")
+			Result.put (create {JSON_BOOLEAN}.make (column_group_control_after), "columnGroupControlAfter")
+		end
 end

sheets/src/objects/eg_sheet.e

@@ -378,7 +378,12 @@ feature -- Element Change
 feature -- Eiffel to JSON
 
 	to_json: JSON_OBJECT
+			-- Json representation of current object.	
 		do
 			create Result.make_empty
+			if attached properties as l_properties then
+				Result.put (l_properties.to_json, "properties")
+			end
+
 		end
 end

sheets/src/objects/eg_sheet_properties.e

@@ -28,37 +28,13 @@ note
 class
 	EG_SHEET_PROPERTIES
 
-inherit
-
-	ANY
-		redefine
-			default_create
-		end
-
-create
-	default_create
-
-feature {NONE} -- Initialization
-
-	default_create
-		do
-			create title.make_empty
-			create sheet_type
-			create grid_properties
-		ensure then
-			sheet_id = 0
-			not is_sheet_id_set
-			not is_sheet_type_set
-		end
-
-
 feature -- Access
 
 	sheet_id: INTEGER
 			-- The ID of the sheet. Must be non-negative. This field cannot be changed once set.
 			-- NATURAL?
 
-	title: STRING
+	title: detachable STRING
 			-- The name of the sheet.
 
 	index: INTEGER
@@ -68,10 +44,10 @@ feature -- Access
 			-- For example, if there were 3 sheets (S1, S2, S3) in order to move S1 ahead of S2 the index would have to be set to 2.
 			-- A sheet index update request is ignored if the requested index is identical to the sheets current index or if the requested new index is equal to the current sheet index + 1.
 
-	sheet_type: EG_SHEET_TYPE
+	sheet_type: detachable EG_SHEET_TYPE
 			-- The type of sheet. Defaults to GRID . This field cannot be changed once set.
 
-	grid_properties: EG_GRID_PROPERTIES
+	grid_properties: detachable EG_GRID_PROPERTIES
 			-- Additional properties of the sheet if this sheet is a grid.
 			-- (If the sheet is an object sheet, containing a chart or image, then this field will be absent.)
 			-- When writing it is an error to set any grid properties on non-grid sheets.
@@ -100,6 +76,7 @@ feature -- Status Report
 feature -- Element Change
 
 	set_sheet_id (a_id:  like sheet_id)
+			-- Set `sheet_id` with `a_id`.
 		require
 			non_negative: a_id >=0
 			not_id_set: not is_sheet_id_set
@@ -111,21 +88,24 @@ feature -- Element Change
 			is_defined: is_sheet_id_set
 		end
 
-	set_title (a_title: STRING)
+	set_title (a_title: like title)
+			-- Set `title` with `a_title`.
 		do
 			title := a_title
 		ensure
 			title_set: title = a_title
 		end
 
 	set_index (a_index: like index)
+			-- Set `index` with `a_index`.
 		do
 			index := a_index
 		ensure
 			index_set: index = a_index
 		end
 
 	set_sheet_type (a_type: EG_SHEET_TYPE)
+			-- Set `sheet_type` with `a_type`.
 		require
 			not_sheet_type: not is_sheet_type_set
 		do
@@ -137,38 +117,89 @@ feature -- Element Change
 		end
 
 	set_grid_properties (a_properties: like grid_properties)
+			-- Set `grid_properties` with `a_properties`.
 		do
 			grid_properties := a_properties
 		ensure
 			grid_properties_set: grid_properties = a_properties
 		end
 
 	set_hidden (a_val: BOOLEAN)
+			-- Set `hidden` with `a_val`.
 		do
 			hidden := a_val
 		ensure
 			hidden_set: hidden = a_val
 		end
 
 	set_tab_color (a_color: like tab_color)
+			-- Set `tab_color` with `a_color`.
 		do
 			tab_color := a_color
 		ensure
 			tab_color_set: tab_color = a_color
 		end
 
 	set_tab_color_style (a_color_style: like tab_color_style)
+			-- Set `tab_color_style` with `a_color_style`.
 		do
 			tab_color_style := a_color_style
 		ensure
 			tab_color_style_set: tab_color_style = a_color_style
 		end
 
 	set_right_to_left (a_val: BOOLEAN)
+			-- Set `right_to_left` with `a_val`.
 		do
 			right_to_left := a_val
 		ensure
 			right_to_left_set: right_to_left = a_val
 		end
 
+feature -- Eiffel to JSON
+
+	to_json: JSON_OBJECT
+--	{
+--		  "sheetId": integer,
+--		  "title": string,
+--		  "index": integer,
+--		  "sheetType": enum (SheetType),
+--		  "gridProperties": {
+--		    object (GridProperties)
+--		  },
+--		  "hidden": boolean,
+--		  "tabColor": {
+--		    object (Color)
+--		  },
+--		  "tabColorStyle": {
+--		    object (ColorStyle)
+--		  },
+--		  "rightToLeft": boolean
+--		}	
+
+		do
+			create Result.make
+			if is_sheet_id_set then
+				Result.put (create {JSON_NUMBER}.make_integer (sheet_id), "sheetId")
+			end
+			if attached title as l_title then
+				Result.put (create {JSON_STRING}.make_from_string (l_title), "title")
+			end
+			Result.put (create {JSON_NUMBER}.make_integer (index), "index")
+			if attached sheet_type as l_st then
+				Result.put (l_st.to_json, "sheetType")
+			end
+			if attached grid_properties as l_gp then
+				Result.put (l_gp.to_json, "gridProperties")
+			end
+			Result.put (create {JSON_BOOLEAN}.make (hidden), "hidden")
+			if attached tab_color as l_tc then
+				Result.put (l_tc.to_json, "tabColor")
+			end
+			if attached tab_color_style as l_tcs then
+				Result.put (l_tcs.to_json, "tabColorStyle")
+			end
+			Result.put (create {JSON_BOOLEAN}.make (right_to_left), "rightToLeft")
+		end
+
 end

sheets/src/objects/eg_sheet_type.e

@@ -74,7 +74,22 @@ feature -- Status Report
 		do
 			Result := a_value = sheet_type_unspecified or else
 			          a_value = grid or else
-			          a_value = object 
+			          a_value = object
+		end
+
+
+feature -- Eiffel to JSON
+
+	to_json: JSON_STRING
+			-- JSon representation of current object.
+		do
+			if is_grid then
+				Result := "GRID"
+			elseif is_object then
+				Result := "OBJECT"
+			else
+				Result := "SHEET_TYPE_UNSPECIFIED"
+			end
 		end
 
 end