Updated EG_BORDERS, EG_NUMBER_FORMAT, EG_NUMBER_FORMAT_TYPE with Eiffel to Json mapping.

Author: jvelilla

sheets/src/objects/eg_border.e

@@ -1,8 +1,23 @@
 note
-	description: "Summary description for {EG_BORDER}."
-	author: ""
+	description: "[
+	A border along a cell. 
+	
+	JSON representation
+
+	{
+	  "style": enum (Style),
+	  "width": integer,
+	  "color": {
+	    object (Color)
+	  },
+	  "colorStyle": {
+	    object (ColorStyle)
+	  }
+	}
+	]"
 	date: "$Date$"
 	revision: "$Revision$"
+	EIS: "name=border", "src=https://developers.google.com/sheets/api/reference/rest/v4/spreadsheets/cells#border", "protocol=uri"
 
 class
 	EG_BORDER

sheets/src/objects/eg_borders.e

@@ -60,5 +60,34 @@ feature -- Access
 	right: EG_BORDER
 			-- The right border of the cell.
 
+feature -- Element Change
+
+	set_top (a_top: like top)
+		do
+			top := a_top
+		end
+
+	set_bottom (a_bottom: like bottom)
+		do
+			bottom := a_bottom
+		end
+
+	set_left (a_left: like left)
+		do
+			left := a_left
+		end
+
+	set_right (a_right: like right)
+		do
+			right := a_right
+		end
+
+
+feature -- Eiffel to JSON
+
+	to_json: JSON_OBJECT
+		do
+			create Result.make_empty
+		end
 
 end

sheets/src/objects/eg_cell_format.e

@@ -192,8 +192,11 @@ feature -- Eiffel to JSON
 		do
 			create Result.make_empty
 				-- TODO
-			Result.put (Void, "numberFormat")
+			if attached number_format as l_number_format then
+				Result.put (l_number_format.to_json, "numberFormat")
+			end
 			Result.put (background_color.to_json, "backgroundColor")
 			Result.put (background_color_style.to_json, "backgroundColorStyle")
+
 		end
 end

sheets/src/objects/eg_number_format.e

@@ -24,4 +24,34 @@ feature
 		-- Pattern string used for formatting. If not set, a default pattern based on the user's locale will be used if necessary for the given type.
 		-- See the Date and Number Formats guide (https://developers.google.com/sheets/api/guides/formats) for more information about the supported patterns.
 
+feature -- Element Change
+
+	set_type (a_type: like type)
+		do
+			type := a_type
+		ensure
+			type_set: type = a_type
+		end
+
+	set_pattern (a_pattern: like pattern)
+		do
+			pattern := a_pattern
+		ensure
+			pattern_set: pattern = a_pattern
+		end
+
+
+feature -- Eiffel to JSON
+
+	to_json: JSON_OBJECT
+		do
+			create Result.make_empty
+			if attached type as l_type then
+				Result.put (l_type.to_json, "type")
+			end
+			if attached pattern as l_pattern then
+				Result.put (create {JSON_STRING}.make_from_string (l_pattern), "pattern")
+			end
+		end
+
 end

sheets/src/objects/eg_number_format_type.e

@@ -1,10 +1,209 @@
 note
-	description: "Summary description for {EG_NUMBER_FORMAT_TYPE}."
-	author: ""
+	description: "[
+			The number format of the cell. In this documentation the locale is assumed to be en_US, but the actual format depends on the locale of the spreadsheet.
+		
+			Enums
+			NUMBER_FORMAT_TYPE_UNSPECIFIED 	The number format is not specified and is based on the contents of the cell. Do not explicitly use this.
+			TEXT 							Text formatting, e.g 1000.12
+			NUMBER 							Number formatting, e.g, 1,000.12
+			PERCENT 						Percent formatting, e.g 10.12%
+			CURRENCY 						Currency formatting, e.g $1,000.12
+			DATE 							Date formatting, e.g 9/26/2008
+			TIME 							Time formatting, e.g 3:59:00 PM
+			DATE_TIME 						Date+Time formatting, e.g 9/26/08 15:59:00
+			SCIENTIFIC 						Scientific number formatting, e.g 1.01E+03
+	]"
 	date: "$Date$"
 	revision: "$Revision$"
 
 class
 	EG_NUMBER_FORMAT_TYPE
 
+inherit
+
+	EG_ENUM
+		redefine
+			default_create
+		end
+
+create
+	default_create
+
+feature {NONE} -- Initialization
+
+	default_create
+		do
+			Precursor
+			set_value (number_format_type_unspecified)
+		end
+
+	number_format_type_unspecified: INTEGER = 1
+			-- The number format is not specified and is based on the contents of the cell. Do not explicitly use this.
+
+	text: INTEGER = 2
+			-- Text formatting, e.g 1000.12.
+
+	number: INTEGER = 3
+			-- Number formatting, e.g, 1,000.12
+
+	percent: INTEGER = 3
+			-- Percent formatting, e.g 10.12%
+
+	currency: INTEGER = 4
+			-- Currency formatting, e.g $1,000.12
+
+	date: INTEGER = 5
+			-- Date formatting, e.g 9/26/2008
+
+	time: INTEGER = 6
+			-- Time formatting, e.g 3:59:00 PM.
+
+	date_time: INTEGER = 7
+			-- Date+Time formatting, e.g 9/26/08 15:59:00
+
+	scientific: INTEGER = 8
+			-- Scientific number formatting, e.g 1.01E+03
+
+
+feature -- Change Elements
+
+	set_text
+		do
+			set_value (text)
+		ensure
+			value_set_with_text: value = text
+		end
+
+	set_number
+		do
+			set_value (number)
+		ensure
+			value_set_with_number: value = number
+		end
+
+	set_percent
+		do
+			set_value (percent)
+		ensure
+			value_set_with_percent: value = percent
+		end
+
+	set_currency
+		do
+			set_value (currency)
+		ensure
+			value_set_with_currency: value = currency
+		end
+
+	set_date
+		do
+			set_value (date)
+		ensure
+			value_set_with_date: value = date
+		end
+
+	set_time
+		do
+			set_value (time)
+		ensure
+			value_set_with_time: value = time
+		end
+
+	set_date_time
+		do
+			set_value (date_time)
+		ensure
+			value_set_with_time: value = date_time
+		end
+
+	set_scientific
+		do
+			set_value (scientific)
+		ensure
+			value_set_with_time: value = scientific
+		end
+
+
+feature -- Status Report
+
+	is_text: BOOLEAN
+		do
+			Result := value = text
+		end
+
+	is_number: BOOLEAN
+		do
+			Result := value = number
+		end
+
+	is_percent: BOOLEAN
+		do
+			Result := value = percent
+		end
+
+	is_currency: BOOLEAN
+		do
+			Result := value = currency
+		end
+
+	is_date: BOOLEAN
+		do
+			Result := value = date
+		end
+
+
+	is_time: BOOLEAN
+		do
+			Result := value = time
+		end
+
+	is_date_time: BOOLEAN
+		do
+			Result := value = date_time
+		end
+
+	is_scientific: BOOLEAN
+		do
+			Result := value = scientific
+		end
+
+	is_valid_value (a_value: INTEGER): BOOLEAN
+			-- Can `a_value' be used in a `set_value' feature call?
+		do
+			Result := a_value = number_format_type_unspecified or else
+			          a_value = text or else
+			          a_value = number or else
+			          a_value = percent or else
+			          a_value = currency or else
+			          a_value = date or else
+			          a_value = time or else
+			          a_value = date_time or else
+			          a_value = scientific
+		end
+
+
+feature -- Eiffel to JSON
+
+	to_json: JSON_STRING
+			-- Json representation of current object.
+		do
+			if is_text then
+				Result := "TEXT"
+			elseif is_number  then
+				Result := "NUMBER"
+			elseif is_percent then
+				Result := "PERCENT"
+			elseif is_currency then
+				Result := "CURRENCY"
+			elseif is_date then
+				Result := "DATE"
+			elseif is_time then
+				Result := "TIME"
+			elseif is_date_time then
+				Result := "DATE_TIME"
+			else
+				Result := "NUMBER_FORMAT_TYPE_UNSPECIFIED"
+			end
+		end
+
 end