Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implemented Item unit of measure component #140

Merged
merged 28 commits into from
Mar 19, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
56a398d
feat(unitofmeasures): implement route and icon for unit of measure
mkumbobeaty Mar 13, 2019
32d52cb
feat(item unit of measure): implement list of item unit of measure
mkumbobeaty Mar 14, 2019
30dd0b7
feat(item unit of measure): add action bar for the unit of measure
mkumbobeaty Mar 14, 2019
fd47e67
feat(item unit of measure): implement selection of unit of measure
mkumbobeaty Mar 14, 2019
3efba26
refactor(item unit of measure): improve search functionality
mkumbobeaty Mar 14, 2019
525ba0f
feat(item unit of measure): add export button for exporting uom
mkumbobeaty Mar 14, 2019
9cddf53
feat(item unit of measure): implement create and edit form
mkumbobeaty Mar 14, 2019
35aa674
Merge branch 'develop' of https://github.com/CodeTanzania/emis-web in…
mkumbobeaty Mar 15, 2019
5f898c5
refactor(itemunit): rename itemunit folder and component
mkumbobeaty Mar 15, 2019
098f48a
refactor(itemunit): re-render list of itemunit from state
mkumbobeaty Mar 15, 2019
9724f69
refactor(itemunit): improve item unit search
mkumbobeaty Mar 15, 2019
7689ffd
refactor(itemunit): improve edit form for item unit
mkumbobeaty Mar 15, 2019
cb6fbdb
feat(itemunit): implement new feature for description
mkumbobeaty Mar 15, 2019
ed7601f
Merge branch 'develop' into feature/uom
BenMaruchu Mar 17, 2019
449b3a0
refactor(itemunits): refactor route of item units
mkumbobeaty Mar 18, 2019
9384cf7
Merge branch 'develop' of https://github.com/CodeTanzania/emis-web in…
mkumbobeaty Mar 18, 2019
67adc49
Merge branch 'feature/uom' of https://github.com/CodeTanzania/emis-we…
mkumbobeaty Mar 18, 2019
d9ef4ad
fix(itemsunit): improve form for creating item unit
mkumbobeaty Mar 19, 2019
cc51ccd
fix(itemunits): merge from develop
mkumbobeaty Mar 19, 2019
c48674c
refactor(itemunits): add icon for item unit of measure
mkumbobeaty Mar 19, 2019
5fd56a3
style(itemunits): refactor unit of measure contents
mkumbobeaty Mar 19, 2019
25cffb6
refactor(itemunits): rename error status
mkumbobeaty Mar 19, 2019
7d25316
refactor(itemunits): rename error status
mkumbobeaty Mar 19, 2019
0977095
Merge branch 'develop' into feature/uom
BenMaruchu Mar 19, 2019
1c2d6a9
Merge branch 'develop' into feature/uom
BenMaruchu Mar 19, 2019
ef33ec7
refactor(itemunits): remove duplicate of words
mkumbobeaty Mar 19, 2019
8857326
Merge branch 'develop' of https://github.com/CodeTanzania/emis-web in…
mkumbobeaty Mar 19, 2019
ee918c3
Merge branch 'feature/uom' of https://github.com/CodeTanzania/emis-we…
mkumbobeaty Mar 19, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Resources/components/ItemUnits/Form/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class ItemUnitForm extends Component {
},
() => {
notifyError(
'Something occurred while updating Unit of measure, please try again!'
'Something occurred while updating unit of measure, please try again!'
BenMaruchu marked this conversation as resolved.
Show resolved Hide resolved
);
}
);
Expand All @@ -97,7 +97,7 @@ class ItemUnitForm extends Component {
},
() => {
notifyError(
'Something occurred while saving Unit of measure of measure, please try again!'
'Something occurred while saving unit of measure of measure, please try again!'
navish marked this conversation as resolved.
Show resolved Hide resolved
);
}
);
Expand Down
8 changes: 4 additions & 4 deletions src/Resources/components/ItemUnits/List/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class ItemUnitList extends Component {
<Fragment>
{/* toolbar */}
<Toolbar
itemName="item unit"
itemName="unit of measure"
page={page}
total={total}
selectedItemsCount={selectedItemUnitsCount}
Expand All @@ -166,11 +166,11 @@ class ItemUnitList extends Component {
onRefresh={() =>
refreshItemUnits(
() => {
notifySuccess('Item units refreshed successfully');
notifySuccess('Unit of measure refreshed successfully');
},
() => {
notifyError(
'An Error occurred while refreshing Item units please contact system administrator'
'An Error occurred while refreshing unit of measure please contact system administrator'
);
}
)
Expand Down Expand Up @@ -216,7 +216,7 @@ class ItemUnitList extends Component {
},
() => {
notifyError(
`An Error occurred while archiving Unit of measure please contact
`An Error occurred while archiving unit of measure please contact
system administrator`
);
}
Expand Down
8 changes: 4 additions & 4 deletions src/Resources/components/ItemUnits/ListItem/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,14 @@ class ItemUnitListItem extends Component {
{isHovered && (
<ListItemActions
edit={{
name: 'Edit Unit of measure',
title: 'Update Unit of measure Details',
name: 'Edit unit of measure',
title: 'Update unit of measure Details',
onClick: onEdit,
}}
archive={{
name: 'Archive Unit of measure',
name: 'Archive unit of measure',
title:
'Remove Unit of measure from the list of active Item unit of measure',
'Remove unit of measure from the list of active item unit of measure',
onClick: this.showArchiveConfirm,
}}
/>
Expand Down
4 changes: 2 additions & 2 deletions src/Resources/components/ItemUnits/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class ItemUnit extends Component {
<Topbar
search={{
size: 'large',
placeholder: 'Search for Unit of measure here ...',
placeholder: 'Search for unit of measure here ...',
onChange: this.searchItemUnit,
value: searchQuery,
}}
Expand Down Expand Up @@ -166,7 +166,7 @@ class ItemUnit extends Component {
{/* create/edit form modal */}
<Modal
title={
isEditForm ? 'Edit Unit Of Measure' : 'Add New Unit Of Measure'
isEditForm ? 'Edit unit of measure' : 'Add new unit of measure'
}
visible={showForm}
footer={null}
Expand Down