Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Q
Quality and Energy Forecast
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
harshavardhan.c
Quality and Energy Forecast
Commits
7d969fac
Commit
7d969fac
authored
Feb 15, 2022
by
harshavardhan.c
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: Json formatting issue fixes.
parent
4b016bf4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
18 deletions
+6
-18
.env
.env
+1
-2
scripts/core/handlers/__init__.py
scripts/core/handlers/__init__.py
+5
-16
No files found.
.env
View file @
7d969fac
...
...
@@ -26,7 +26,6 @@ INTERVAL=60
EMAIL_SERVICE_PROXY=https://cloud.ilens.io/sms-util
MQTT_URL=192.168.0.220
MQTT_PORT=1883
FILES_MAPPING={"Quality Report_AC2O.xlsx":{"Pure Tank":"A4:E7"}}
COLUMN_BASED_SHEETS={"Quality Report_AC2O.xlsx":["Sheet1"]}
FILES_MAPPING='{"file_name":"Quality Report_AC2O.xlsx","sheet_name":"Pure Tank","fill_range":"A4:E7","column_based": true}'
TEMPLATE_PATH=data/templates
DATA_PATH=C:/Users/harshavardhan.c/Downloads
\ No newline at end of file
scripts/core/handlers/__init__.py
View file @
7d969fac
import
json
import
os.path
import
sys
from
datetime
import
datetime
from
dateutil
import
parser
...
...
@@ -14,15 +12,6 @@ from scripts.utils.ilens_publish_data import DataPush
enable_timestamp
=
os
.
environ
.
get
(
"CURRENT_TIMESTAMP"
,
default
=
"true"
)
code_timezone
=
os
.
environ
.
get
(
"TIMEZONE"
,
default
=
"Asia/Kolkata"
)
project_id
=
os
.
environ
.
get
(
"PROJECT_ID"
,
default
=
"project_099"
)
files_mapping
=
os
.
environ
.
get
(
"FILES_MAPPING"
,
default
=
""
)
columns_based_sheets
=
os
.
environ
.
get
(
"COLUMN_BASED_SHEETS"
,
default
=
{})
if
not
files_mapping
:
print
(
"Files Mapping Found empty, existing!!"
)
sys
.
exit
(
0
)
if
not
columns_based_sheets
:
print
(
"Files Mapping Found empty, existing!!"
)
sys
.
exit
(
0
)
columns_based_sheets
=
json
.
loads
(
columns_based_sheets
)
class
ExcelUploadHandler
:
...
...
@@ -33,7 +22,7 @@ class ExcelUploadHandler:
self
.
project_id
=
project_id
self
.
kafka_conn
=
DataPush
()
def
parse_excel_data
(
self
,
template_file_path
,
data_file_path
,
template_fill_range
,
file_name
,
def
parse_excel_data
(
self
,
template_file_path
,
data_file_path
,
template_fill_range
,
file_name
,
column_enabled
,
sheet_name
=
"Sheet1"
):
try
:
if
not
os
.
path
.
join
(
template_file_path
):
...
...
@@ -47,7 +36,7 @@ class ExcelUploadHandler:
data_parameters
=
self
.
get_file_object_data
(
file
=
data_file_path
,
fill_range
=
template_fill_range
,
sheet_name
=
sheet_name
)
self
.
execute_data_insertion
(
template_parameters
=
template_parameters
,
data_parameters
=
data_parameters
,
fill_range
=
template_fill_range
,
file_name
=
file_name
,
sheet_name
=
sheet_name
)
fill_range
=
template_fill_range
,
column_enabled
=
column_enabled
)
except
Exception
as
e
:
logger
.
exception
(
f
"Exception occurred while parsing the excel data {e.args}"
)
...
...
@@ -74,8 +63,8 @@ class ExcelUploadHandler:
logger
.
error
(
e
.
args
)
raise
def
execute_data_insertion
(
self
,
template_parameters
:
dict
,
data_parameters
:
dict
,
fill_range
,
sheet_name
:
str
,
file_name
:
str
):
def
execute_data_insertion
(
self
,
template_parameters
:
dict
,
data_parameters
:
dict
,
fill_range
,
column_enabled
:
bool
):
try
:
__start_coords__
,
__end_coords__
=
self
.
excel
.
get_row_column
(
fill_range
)
start_row
,
start_column
=
__start_coords__
...
...
@@ -88,7 +77,7 @@ class ExcelUploadHandler:
'retain_flag'
:
True
,
'msg_id'
:
1
,
"p_id"
:
""
}
key_mapping_json
=
dict
(
zip
(
template_parameters
.
values
(),
template_parameters
.
keys
()))
date_keys
=
[
item
for
item
in
list
(
key_mapping_json
.
keys
())
if
item
and
item
.
startswith
(
"date"
)]
if
sheet_name
not
in
columns_based_sheets
.
get
(
file_name
)
:
if
not
column_enabled
:
for
_row
in
rows_range
:
res
=
[
item
for
item
in
list
(
template_parameters
.
keys
())
if
item
.
endswith
(
_row
)]
_dict
=
{
template_parameters
[
_element
]:
data_parameters
[
_element
]
for
_element
in
res
if
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment