Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
2f94652
ka
rahuldevgarg Dec 5, 2023
f05f01a
Merge pull request #1 from ddws-org/naljal
rahuldevgarg Dec 5, 2023
f09b58d
remaining folders
rahuldevgarg Dec 5, 2023
0b74fc4
Merge pull request #2 from ddws-org/naljal
rahuldevgarg Dec 5, 2023
48852ae
Added tenants.json file and tenants folder
Saloni-eGov Dec 5, 2023
b4634f6
added script for creation of tenants
Saloni-eGov Dec 5, 2023
3e6c6b7
Merge pull request #6 from ddws-org/scripts_added
rahuldevgarg Dec 5, 2023
1a17de4
Merge pull request #4 from ddws-org/tenants-creation
pradeepkumarcm-egov Dec 5, 2023
9c4d2f2
ka
gargrahuldev Dec 6, 2023
078311b
Merge pull request #7 from gargrahuldev/patch-1
rahuldevgarg Dec 6, 2023
f84cde8
Update AppVersion.json
rahuldevgarg Dec 6, 2023
b5509b4
Merge pull request #8 from ddws-org/rahuldevgarg-patch-1
rahuldevgarg Dec 6, 2023
c872f47
added panchayat code and name and testing tenants
ShubhamDev056 Dec 6, 2023
f344d2d
Merge pull request #9 from ddws-org/testing-ka
pradeepkumarcm-egov Dec 6, 2023
d49edfb
Update roleactions.json
Saloni-eGov Dec 7, 2023
2778ea6
Merge pull request #10 from ddws-org/saloni041-patch-2
pradeepkumarcm-egov Dec 7, 2023
d3b7eef
Update roles.json
debasishchakraborty-egovt Dec 11, 2023
f9d001a
Merge pull request #11 from ddws-org/debasishchakraborty-egovt-patch-1
pradeepkumarcm-egov Dec 11, 2023
1a18cad
Update actions-test.json
debasishchakraborty-egovt Dec 12, 2023
a847920
Update actions-test.json
debasishchakraborty-egovt Dec 12, 2023
b2f1559
Update actions-test.json
debasishchakraborty-egovt Dec 12, 2023
bd6637d
Update roleactions.json
debasishchakraborty-egovt Dec 12, 2023
4aea699
Merge pull request #12 from ddws-org/debasishchakraborty-egovt-patch-1
pradeepkumarcm-egov Dec 12, 2023
8674508
Merge pull request #13 from ddws-org/debasishchakraborty-egovt-patch-2
pradeepkumarcm-egov Dec 12, 2023
ef23823
Enabled HRMS module
rakesh-wt-egov Dec 12, 2023
475b740
Enabled HRMS for testing tenant
rakesh-wt-egov Dec 12, 2023
7a638ea
Merge pull request #14 from ddws-org/rakesh-wt-egov-patch-1
debasishchakraborty-egovt Dec 12, 2023
6737dba
Added DWSS department
rakesh-wt-egov Dec 13, 2023
c93f414
Added Designation
rakesh-wt-egov Dec 13, 2023
c69ed8d
Create WSServiceRoles.json
rakesh-wt-egov Dec 13, 2023
999878e
Merge pull request #15 from ddws-org/rakesh-wt-egov-patch-1
rakesh-wt-egov Dec 13, 2023
203d2b6
Update StateInfo.json
rahuldevgarg Dec 18, 2023
5c65a1b
Merge pull request #16 from ddws-org/rahuldevgarg-patch-2
rahuldevgarg Dec 18, 2023
777009a
Update StateInfo.json URL Change
rahuldevgarg Dec 18, 2023
25230e7
Merge pull request #17 from ddws-org/rahuldevgarg-patch-2
rahuldevgarg Dec 18, 2023
1b280e1
Update master-config.json
rakesh-wt-egov Dec 21, 2023
051e055
Merge pull request #18 from ddws-org/rakesh-wt-egov-patch-2
rakesh-wt-egov Dec 21, 2023
21719af
Update master-config.json
rakesh-wt-egov Dec 21, 2023
144efee
Merge pull request #19 from ddws-org/rakesh-wt-egov-patch-3
rakesh-wt-egov Dec 21, 2023
8b90047
Update Designation.json
rakesh-wt-egov Dec 21, 2023
f6caa27
Merge pull request #20 from ddws-org/rakesh-wt-egov-patch-4
rakesh-wt-egov Dec 21, 2023
ff64f0e
changes in active key
Dec 28, 2023
518f624
Merge pull request #21 from ddws-org/shubhamdev-patch-1
rahuldevgarg Dec 28, 2023
4e8be44
Updated the billing for Non_Metered
Taniya-eGov Jan 8, 2024
b66d827
added Gujarat and Assam
rahuldevgarg Feb 5, 2024
0ec6a66
Merge pull request #23 from ddws-org/added-more-states
pradeepkumarcm-egov Feb 5, 2024
cb75c2e
Added new roles for HRMS
Feb 8, 2024
bc28623
update tenant.json and added data of villages
ShubhamDev056 Feb 8, 2024
7605aea
Added new roles for HRMS
Feb 8, 2024
6c5d159
Update roles.json
debasishchakraborty-egovt Feb 8, 2024
46cbb64
Merge pull request #24 from ddws-org/SM-NEWROLES
pradeepkumarcm-egov Feb 8, 2024
b29e735
Added new roles for NAljal
Feb 8, 2024
04b857b
Merge pull request #26 from ddws-org/SM-3908
pradeepkumarcm-egov Feb 8, 2024
9ad3caf
removed .DS_Store
ShubhamDev056 Feb 8, 2024
9225b08
Added new roles for NAljal for hrms
Feb 8, 2024
4423df0
Merge pull request #27 from ddws-org/SM-3908-hrms
pradeepkumarcm-egov Feb 8, 2024
a457d34
Merge pull request #22 from ddws-org/taniya-patch1
pradeepkumarcm-egov Feb 8, 2024
bc82825
removed .DS_Store
ShubhamDev056 Feb 8, 2024
fccc685
Merge pull request #25 from ddws-org/shubhamdev-patch-2
pradeepkumarcm-egov Feb 8, 2024
344f2e4
Update StateInfo.json added digitFooterWhite
rahuldevgarg Feb 9, 2024
7c67edd
Update StateInfo.json
rahuldevgarg Feb 9, 2024
25d7284
Update StateInfo.json
rahuldevgarg Feb 9, 2024
ddf4c27
Update StateInfo.json
rahuldevgarg Feb 9, 2024
422aaa9
Update StateInfo.json
rahuldevgarg Feb 9, 2024
e472fe6
backend-url-change-context
rahuldevgarg Feb 9, 2024
1a3645d
Update actions-test.json ka ws-service mdms update
rahuldevgarg Feb 9, 2024
a724a21
Merge pull request #28 from ddws-org/backend-url-change-context
pradeepkumarcm-egov Feb 9, 2024
45c19e2
removed extra roles from WSServiceRoles.json
ShubhamDev056 Feb 12, 2024
76bce38
Added new roles for Naljal for mdms_admin
Feb 15, 2024
4531326
Merge pull request #30 from ddws-org/addMDMSADMINROLE
debasishchakraborty-egovt Feb 15, 2024
8725901
Merge pull request #29 from ddws-org/shubhamdev-patch-3
pradeepkumarcm-egov Feb 21, 2024
b67af3e
added mp state mdms config folder
ShubhamDev056 Feb 27, 2024
7b98a72
Merge pull request #31 from ddws-org/shubhamdev-patch-4
pradeepkumarcm-egov Feb 28, 2024
9b746fe
updated tenantId pb to mp and logo url in tenans.json.
ShubhamDev056 Feb 29, 2024
71c60d3
Merge pull request #32 from ddws-org/shubhamdev-patch-4
rahuldevgarg Feb 29, 2024
9206fa4
Update AppVersion.json
rahuldevgarg Feb 29, 2024
5e1a1b4
Added tenants folders for Damoh village and update tenants.json as well.
ShubhamDev056 Mar 1, 2024
60c688e
prepend madhyapradesh in url key
ShubhamDev056 Mar 8, 2024
f2064f4
Merge pull request #34 from ddws-org/shubhamdev-patch-6
pradeepkumarcm-egov Mar 8, 2024
3446a4b
Merge pull request #33 from ddws-org/shubhamdev-patch-5
pradeepkumarcm-egov Mar 12, 2024
b2e77e0
Added Rajgarh, Seoni and Chhindwara tenants data
ShubhamDev056 Mar 12, 2024
94cd10a
Merge pull request #35 from ddws-org/shubhamdev-patch-7
pradeepkumarcm-egov Mar 12, 2024
d46822d
Updated "action-test.json", "roleactions.json " and "roles.josn"
ShubhamDev056 Mar 18, 2024
7c0192a
Merge pull request #36 from ddws-org/shubhamdev-patch8
pradeepkumarcm-egov Mar 18, 2024
e79f417
updated citymodule
ShubhamDev056 Mar 18, 2024
39ef68d
Merge pull request #37 from ddws-org/shubhamdev-patch8
manojsjjm Mar 18, 2024
70c685e
Added WSServiceRoles.json in MP state
ShubhamDev056 Mar 19, 2024
5b9c948
Merge pull request #38 from ddws-org/shubhamdev-patch-9
manojsjjm Mar 19, 2024
61e5e22
updated Department and designation files for MP
ShubhamDev056 Mar 19, 2024
f90604f
Merge pull request #39 from ddws-org/shubhamdev-patch-9
manojsjjm Mar 19, 2024
6e00fc4
updated action files
ShubhamDev056 Mar 21, 2024
62392e8
Merge pull request #40 from ddws-org/shubhamdev-patch-10
pradeepkumarcm-egov Mar 21, 2024
477473a
SM-4000 added financial year and tax period for year 2024-25
Saloni-eGov Apr 1, 2024
3f6a3b8
Delete .idea/inspectionProfiles/profiles_settings.xml
Saloni-eGov Apr 1, 2024
3a8b178
Delete .idea/misc.xml
Saloni-eGov Apr 1, 2024
c9fcdb1
Delete .idea/vcs.xml
Saloni-eGov Apr 1, 2024
e5f5eed
Delete .idea/workspace.xml
Saloni-eGov Apr 1, 2024
23550fa
Merge pull request #42 from ddws-org/SM-4000
pradeepkumarcm-egov Apr 1, 2024
b37a6bf
changed taxperiod.json file
Saloni-eGov Apr 1, 2024
52454fb
Merge pull request #43 from ddws-org/SM-4000
Saloni-eGov Apr 1, 2024
fc19317
updated Non_Metered charges
ShubhamDev056 Apr 1, 2024
31d1500
Merge pull request #44 from ddws-org/shubhamdev-patch-10
ShubhamDev056 Apr 1, 2024
c28f995
updated water changes of some rajgarh villages
ShubhamDev056 Apr 1, 2024
7971204
update rates
ShubhamDev056 Apr 2, 2024
037e52d
Merge pull request #45 from ddws-org/shubhamdev-patch-10
ShubhamDev056 Apr 2, 2024
9c5e6f0
updated charges of MP villages
ShubhamDev056 Apr 2, 2024
5c834a6
updated flat charges 100 to 60
ShubhamDev056 Apr 2, 2024
7c98754
Merge pull request #46 from ddws-org/shubhamdev-patch-10
shubhamdevgupta Apr 2, 2024
442c772
updated remaning charges
ShubhamDev056 Apr 2, 2024
281812f
Merge pull request #47 from ddws-org/shubhamdev-patch-10
ShubhamDev056 Apr 4, 2024
061b6cc
added testing tenant folder in MP and update water chrages for non me…
ShubhamDev056 Apr 4, 2024
d915052
Merge pull request #48 from ddws-org/shubhamdev-patch-10
ShubhamDev056 Apr 4, 2024
a436af8
updated
ShubhamDev056 Apr 5, 2024
16eaad8
update
ShubhamDev056 Apr 5, 2024
ab9651f
Added Home path ( #49 )
anilsingha-eGov Apr 5, 2024
c127577
Update actions-test.json
anilsingha-eGov Apr 8, 2024
beacd9b
Update actions-test.json ( #50 )
anilsingha-eGov Apr 8, 2024
3164aed
SM-4020: Removed ONLINE mode
anilsingha-eGov Apr 15, 2024
c834d93
SM-4020:REMOVED POSTAL_ORDER
anilsingha-eGov Apr 15, 2024
2b2ca61
Update PaymentService.json
anilsingha-eGov Apr 15, 2024
0bfc907
Merge pull request #51 from ddws-org/SM-4020-mdms
pradeepkumarcm-egov Apr 15, 2024
55e1a44
Revert "SM-4020: Removed ONLINE mode"
anilsingha-eGov Apr 16, 2024
c38999e
SM-4020: Removed ONLINE
anilsingha-eGov Apr 16, 2024
994dc7b
SM-4020: Removed ONLINE ( #52 )
anilsingha-eGov Apr 16, 2024
bbb492d
Revert "SM-4020: Removed ONLINE mode" ( #53 )
anilsingha-eGov Apr 16, 2024
a778aa1
update logoUrl for MP state
ShubhamDev056 Apr 22, 2024
9c58960
Merge pull request #59 from ddws-org/shubhamdev-patch-13
shubhamdevgupta Apr 22, 2024
e0c1e26
Update IdFormat.json
Saloni-eGov Apr 23, 2024
7f4be3c
Merge pull request #60 from ddws-org/saloni041-patch-2
pradeepkumarcm-egov Apr 23, 2024
44d6d44
Revert "Update IdFormat.json"
Saloni-eGov Apr 23, 2024
e41036d
Merge pull request #61 from ddws-org/revert-60-saloni041-patch-2
pradeepkumarcm-egov Apr 23, 2024
2cda2d4
update tenant.json and upload tenants folders for assam
ShubhamDev056 May 1, 2024
43568ce
Merge pull request #62 from ddws-org/shubhamdev-patch-14
shubhamdevgupta May 1, 2024
cde2044
update language in assam Stateinfo.json
ShubhamDev056 May 2, 2024
f8a8e06
Merge pull request #63 from ddws-org/shubhamdev-patch-14
shubhamdevgupta May 2, 2024
23835f5
Update IdFormat.json
Saloni-eGov May 6, 2024
dd43d24
Merge pull request #64 from ddws-org/saloni041-patch-2
pradeepkumarcm-egov May 6, 2024
1826e06
Revert "Update IdFormat.json"
Saloni-eGov May 6, 2024
36ab85d
Merge pull request #65 from ddws-org/revert-64-saloni041-patch-2
Saloni-eGov May 6, 2024
672d7b7
Update IdFormat.json
Saloni-eGov May 6, 2024
024aa87
Merge pull request #66 from ddws-org/saloni041-patch-2
Saloni-eGov May 6, 2024
4b9d0e1
added la folder for ladakh and update tenant.json
ShubhamDev056 May 28, 2024
c921705
Merge pull request #67 from ddws-org/shubhamdev-patch-15
ShubhamDev056 May 28, 2024
6fb6a6d
Added file masking patterns and security policy
Saloni-eGov May 29, 2024
8764f26
Merge pull request #68 from ddws-org/ISNE-101
Saloni-eGov May 29, 2024
ef2c875
update url in ka
ShubhamDev056 May 31, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file not shown.
142 changes: 142 additions & 0 deletions Scripts/Tenant _CreationOrUpdation/create_tenants_json.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
import openpyxl
import json

json_file = "tenants.json"
# Opening JSON file
f = open(json_file)

# returns JSON object as
# a dictionary
data = json.load(f)
# Iterating through the json
# list
json_data = {

}
for i in data['tenants']:
json_data[i['code']] = i
# Define variable to load the dataframe
dataframe = openpyxl.load_workbook("KA_data_IMIS .xlsx",data_only=True)

# Define variable to read sheet
dataframe1 = dataframe["Sheet1"]

# Iterate the loop to read the cell values
count = 0
change = {
"tenantId": "ka",
"moduleName": "tenant",
"tenants": [
{
"code": "ka",
"name": "Karnataka",
"description": "Karnataka",
"logoId": "https://s3.ap-south-1.amazonaws.com/pb-egov-assets/pb.jalandhar/logo.png",
"imageId": "https://s3.ap-south-1.amazonaws.com/pb-egov-assets/pb.jalandhar/logo.png",
"domainUrl": "www.mcjalandhar.in",
"type": "CITY",
"twitterUrl": "https://twitter.com/search?q=%23jalandhar",
"facebookUrl": "https://www.facebook.com/city/jalandhar-Punjab",
"emailId": "[email protected]",
"OfficeTimings": {
"Mon - Fri": "9.00 AM - 6.00 PM"
},
"city": {
"name": "Karnataka State",
"localName": None,
"districtCode": None,
"districtName": None,
"regionName": None,
"ulbGrade": "ST",
"longitude": 75.5761829,
"latitude": 31.3260152,
"shapeFileLocation": None,
"captcha": None,
"code": "15",
"ddrName": "Karnataka",
"projectId": "15"
},
"address": "Karnataka-144001",
"pincode": [],
"contactNumber": "0181-2227015",
"pdfHeader": "PB_PDF_HEADER",
"pdfContactDetails": "PB_CONTACT_DETAILS"
}
]
}
changed_v_code = []


def create_tenant(code, gpwsc, scheme, district_code, district_name, block_code,block_name,panchayat_code,panchayat_name):
village = {}
city_tenant_id = 'ka.' + scheme.lower()
village['code'] = city_tenant_id.replace(" ", "")
village['name'] = gpwsc
village['description'] = gpwsc
village['logoId'] = ""
village['imageId'] = None
village['domainUrl'] = ""
village['city'] = "CITY"
village['twitterUrl'] = None
village['facebookUrl'] = None
village['emailId'] = ""
village['OfficeTimings'] = {"Mon - Fri": "9.00 AM - 6.00 PM"}
city = {'name': gpwsc, 'localName': gpwsc, 'districtCode': district_code, 'districtName': district_name,
'blockcode': getNull(block_code),
'blockname':getNull(block_name),
'panchayatcode':getNull(panchayat_code),
'panchayatname':getNull(panchayat_name),
'ulbGrade': "", 'longitude': None, 'latitude': None, 'captcha': None, 'shapeFileLocation': None,
'code': str(code), 'ddrName': gpwsc, 'projectId': str(code)}
village['city'] = city
village['address'] = gpwsc
village['pincode'] = []
village['contactNumber'] = ""
village['pdfHeader'] = ""
village['pdfContactDetails'] = ""
return village
def getNull(data):
if data=="None":
return None
else:
return data

for row in range(0, 1):
arr = []
for col in dataframe1.iter_cols(0, 6):
arr.append(str(col[row].value))
for i in arr:
print(str(arr.index(i)), ":", i, end=", ")
print("", end="\n")
print("----------------------------------------------------------------------------------------------", end="\n")
for row in range(1, 728): #specify range
arr = []
for col in dataframe1.iter_cols(0, 9):
arr.append(str(col[row].value))
tenant = json_data.get("ka." + arr[0])
if tenant is None:
tenant = create_tenant(arr[8], arr[1], arr[0], arr[2], arr[3], arr[4], arr[5], arr[6], arr[7])
for i in arr:
print(str(arr.index(i)), ":", i, end=", ")
tenant["city"]["districtCode"] = arr[2]
tenant["city"]["districtName"] = arr[3]
tenant["city"]["regionName"] = arr[4]
if tenant["city"]["code"] != arr[5]:
changed_v_code.append(tenant)
change["tenants"].append(tenant)
print("", end="\n")
count += 1
if len(changed_v_code) == 0:
print("No Mismatch", end="\n")
else:
print("mismatch villages: ", changed_v_code)
print("count: " + str(count))
print(change)
# Serializing json
json_object = json.dumps(change, indent=4)

# Writing to sample.json
with open("tenants_new.json", "w") as outfile:
outfile.write(json_object)
# Closing file
f.close()
Loading