Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dida Adams Arizona
Tia-dev
Commits
f8f7121f
Commit
f8f7121f
authored
Aug 27, 2020
by
EKSAD
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into riri
parents
bca2fa8d
3c9d73d1
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
309 additions
and
79 deletions
+309
-79
index.js
src/api/index.js
+12
-2
BudgetTahunan.js
src/container/BudgetTahunan.js
+281
-61
AddUser.js
src/container/Otorisasi/User/AddUser.js
+5
-5
EditUser.js
src/container/Otorisasi/User/EditUser.js
+5
-5
AddRole.js
src/container/Otorisasi/UserRole/AddRole.js
+3
-3
EditRole.js
src/container/Otorisasi/UserRole/EditRole.js
+3
-3
No files found.
src/api/index.js
View file @
f8f7121f
...
...
@@ -133,7 +133,6 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
const
getReportItems
=
()
=>
api
.
get
(
'item_report/get_all_item_report'
)
const
getInputType
=
()
=>
api
.
get
(
'type_item_report/get_all_type_item_report'
)
const
getReportType
=
()
=>
api
.
get
(
'report/get_all_report'
)
const
getReportTypeBody
=
(
body
)
=>
api
.
post
(
'report/get_all_report'
,
body
)
const
getDetailReportItems
=
(
userId
)
=>
api
.
get
(
`item_report/get_item_report_by_id/
${
userId
}
`
)
const
searchReportItems
=
(
body
)
=>
api
.
post
(
'/item_report/search_item_report'
,
body
)
const
createReportItems
=
(
body
)
=>
api
.
post
(
'/item_report/create_item_report'
,
body
)
...
...
@@ -155,6 +154,13 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
const
uploadParameter
=
(
body
)
=>
api
.
post
(
'/setting/import_setting'
,
body
)
const
searchParameter
=
(
body
)
=>
api
.
post
(
'setting/search_setting'
,
body
)
//Transaction
const
getReportTypeBody
=
(
body
)
=>
api
.
post
(
'transaction/get_all_report'
,
body
)
const
getMasterBudgetAtt
=
(
body
)
=>
api
.
post
(
'transaction/get_report_attachment'
,
body
)
const
uploadAttachment
=
(
body
)
=>
api
.
post
(
'transaction/upload_attachment'
,
body
)
const
getRevision
=
(
body
)
=>
api
.
post
(
'transaction/get_revision'
,
body
)
const
getPeriodeTransaction
=
()
=>
api
.
get
(
'transaction/get_periode'
)
//Template
const
downloadTemplate
=
(
fileName
,
fileType
)
=>
api
.
get
(
`attachment/download_file?fileName=
${
fileName
}
&&fileType=
${
fileType
}
`
)
...
...
@@ -252,7 +258,11 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
getDetailUnitBisnis
,
uploadFoto
,
getReportTypeBody
,
getPermission
getPermission
,
getMasterBudgetAtt
,
uploadAttachment
,
getPeriodeTransaction
,
getRevision
}
}
...
...
src/container/BudgetTahunan.js
View file @
f8f7121f
This diff is collapsed.
Click to expand it.
src/container/Otorisasi/User/AddUser.js
View file @
f8f7121f
...
...
@@ -158,17 +158,17 @@ export default class AddUser extends Component {
var
isEmail
=
this
.
isEmail
(
this
.
state
.
email
)
if
(
R
.
isEmpty
(
this
.
state
.
fullname
))
{
this
.
setState
({
errorFullname
:
true
,
msgErrorFN
:
'Fullname
is required
'
})
this
.
setState
({
errorFullname
:
true
,
msgErrorFN
:
'Fullname
Cannot be Empty
'
})
}
else
if
(
R
.
isEmpty
(
this
.
state
.
email
))
{
this
.
setState
({
errorEmail
:
true
,
msgErrorEM
:
'Email
is required
'
})
this
.
setState
({
errorEmail
:
true
,
msgErrorEM
:
'Email
Cannot be Empty
'
})
}
else
if
(
!
isEmail
)
{
this
.
setState
({
errorEmail
:
true
,
msgErrorEM
:
'Email format not recognized!'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
role
))
{
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role name
is required
'
})
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role name
Cannot be Empty
'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
startDate
))
{
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'Start date
is required
'
})
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'Start date
Cannot be Empty
'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
endDate
))
{
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'End date
is required
'
})
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'End date
Cannot be Empty
'
})
}
// else if (this.state.privileges.length < 1) {
// alert('Hak Akses belum di pilih !!')
...
...
src/container/Otorisasi/User/EditUser.js
View file @
f8f7121f
...
...
@@ -166,17 +166,17 @@ export default class EditUser extends Component {
// console.log(this.state.tempData)
if
(
R
.
isEmpty
(
this
.
state
.
tempData
.
fullname
))
{
this
.
setState
({
errorFullname
:
true
,
msgErrorFN
:
'Full Name
is Required
'
})
this
.
setState
({
errorFullname
:
true
,
msgErrorFN
:
'Full Name
Cannot be Empty
'
})
}
else
if
(
R
.
isEmpty
(
this
.
state
.
tempData
.
email
))
{
this
.
setState
({
errorEmail
:
true
,
msgErrorEM
:
'Email
is Required
'
})
this
.
setState
({
errorEmail
:
true
,
msgErrorEM
:
'Email
Cannot be Empty
'
})
}
else
if
(
!
isEmail
)
{
this
.
setState
({
errorEmail
:
true
,
msgErrorEM
:
'Email format not recognized!'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
role
))
{
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role Name
is Required
'
})
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role Name
Cannot be Empty
'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
tempData
.
start_date
))
{
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'Start Date
is Required
'
})
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'Start Date
Cannot be Empty
'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
tempData
.
end_date
))
{
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'End Date
is Required
'
})
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'End Date
Cannot be Empty
'
})
}
// else if (this.state.privileges.length < 1) {
// alert('Hak Akses belum di pilih !!')
...
...
src/container/Otorisasi/UserRole/AddRole.js
View file @
f8f7121f
...
...
@@ -110,11 +110,11 @@ export default class AddRole extends Component {
validasi
()
{
if
(
R
.
isEmpty
(
this
.
state
.
roleName
))
{
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role name
is required
'
})
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role name
Cannot be Empty
'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
startDate
))
{
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'Start date
is required
'
})
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'Start date
Cannot be Empty
'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
endDate
))
{
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'End date
is required
'
})
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'End date
Cannot be Empty
'
})
}
else
if
(
this
.
state
.
privileges
.
length
<
1
)
{
this
.
setState
({
alert
:
true
,
messageAlert
:
'You must choose the Access Rights!!'
,
tipeAlert
:
'warning'
})
}
else
{
...
...
src/container/Otorisasi/UserRole/EditRole.js
View file @
f8f7121f
...
...
@@ -116,11 +116,11 @@ export default class EditRole extends Component {
validasi
()
{
if
(
R
.
isEmpty
(
this
.
state
.
tempData
.
role_name
))
{
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role name
is required
'
})
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role name
Cannot be Empty
'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
tempData
.
start_date
))
{
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'Start date
is required
'
})
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'Start date
Cannot be Empty
'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
tempData
.
end_date
))
{
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'End date
is required
'
})
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'End date
Cannot be Empty
'
})
}
else
if
(
this
.
state
.
privileges
.
length
<
1
)
{
this
.
setState
({
alert
:
true
,
messageAlert
:
'You must choose the Access Rights'
,
tipeAlert
:
'warning'
})
}
else
{
...
...
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