 Santiago L
|
4406c78aed
|
Merge branch 'testing' into feature/all-device-list
|
2022-05-12 14:49:22 +02:00 |
|
Santiago L
|
290c260511
|
Update breadcrum: All devices VS Unassigned
|
2022-05-12 14:43:41 +02:00 |
Cayo Puigdefabregas
|
0e974c0e92
|
add tags in device list
|
2022-05-12 11:33:28 +02:00 |
|
Cayo Puigdefabregas
|
515f31c562
|
fixed bug #3387
|
2022-05-12 10:15:46 +02:00 |
|
Santiago L
|
80d18e34a8
|
Merge pull request #256 from RubenPX/makingPublic-fields
fix code issues & add support to old browsers
|
2022-05-11 18:38:14 +02:00 |
|
Cayo Puigdefabregas
|
a2bfbef8cf
|
Merge branch 'testing' into feature/list-snapshots-view-#3113
|
2022-05-11 18:24:25 +02:00 |
|
Santiago L
|
87194cf090
|
Merge pull request #266 from eReuse/bugfix/#3380-to-text
Fix error when trade.document.url is None on device_list.html
|
2022-05-11 18:23:24 +02:00 |
|
Cayo Puigdefabregas
|
bdc04c643c
|
fixed url == None
|
2022-05-11 18:14:33 +02:00 |
|
Cayo Puigdefabregas
|
0f512d4bb3
|
fix link to device and show correctly date
|
2022-05-11 18:00:18 +02:00 |
|
Cayo Puigdefabregas
|
1baeddbd56
|
Merge branch 'feature/server-side-render-parser-3021' into feature/list-snapshots-view-#3113
|
2022-05-11 17:04:47 +02:00 |
|
Cayo Puigdefabregas
|
5e74255145
|
basic list snapshots
|
2022-05-11 16:59:36 +02:00 |
RubenPX
|
651c0cb9d8
|
Fix text select lots instead devices
|
2022-05-09 13:57:17 +02:00 |
|
RubenPX
|
2e42b08519
|
use babel to support old browsers
|
2022-05-09 11:07:57 +02:00 |
|
Cayo Puigdefabregas
|
8d9abb58e3
|
fixed bug #3352
|
2022-05-09 10:18:22 +02:00 |
|
Santiago L
|
84b384c47b
|
Merge pull request #254 from RubenPX/patch-1
Fix minor typos
|
2022-05-06 20:17:36 +02:00 |
|
Santiago L
|
4c16065afa
|
Fix typo: Unassgined to Unassigned #3339
|
2022-05-06 20:15:35 +02:00 |
|
RubenPX
|
eb5c109220
|
Merge commit '7177b0fbfda37e495387834c7f2342b78f6559c8' into feature/confirm-trade-changes
|
2022-05-06 08:26:37 +02:00 |
|
Santiago L
|
00c5070784
|
Merge pull request #241 from RubenPX/bugfix/various-fixes
Several bug fixes on selector & lot component
|
2022-05-06 07:52:15 +02:00 |
|
Cayo Puigdefabregas
|
3ca7292448
|
drop download public links
|
2022-05-05 18:36:52 +02:00 |
|
Cayo Puigdefabregas
|
33fd574f18
|
add lots tab in device details
|
2022-05-05 12:31:29 +02:00 |
|
Cayo Puigdefabregas
|
1c670641f4
|
add web: public link in device details page
|
2022-05-05 12:00:40 +02:00 |
|
RubenPX
|
cb4f12eb1e
|
Merge remote-tracking branch 'MyRepo/testing' into feature/confirm-trade-changes
|
2022-05-03 19:21:14 +02:00 |
|
RubenPX
|
e30779fcde
|
Merge remote-tracking branch 'MyRepo/testing' into bugfix/various-fixes
|
2022-05-03 19:20:59 +02:00 |
|
RubenPX
|
9d9514e68b
|
Select full list devices
|
2022-05-03 12:13:15 +02:00 |
|
Cayo Puigdefabregas
|
c14d8482be
|
Merge branch 'testing' into change/#3202-change-tag-for-unique-identifier
|
2022-04-28 18:32:39 +02:00 |
|
Cayo Puigdefabregas
|
3a5e806104
|
add icons types of devices in list of devices
|
2022-04-28 17:46:12 +02:00 |
|
RubenPX
|
4aa024b041
|
checkpoint: add confirmation dialog
|
2022-04-28 16:58:44 +02:00 |
|
Cayo Puigdefabregas
|
87c66cf5cd
|
change tags for unique identifiers
|
2022-04-28 11:47:52 +02:00 |
|
Santiago L
|
6946a2584b
|
Refactor: group related code (delete button & modal status)
|
2022-04-28 11:39:40 +02:00 |
|
Santiago L
|
8125279619
|
Add comment to not rendered code
|
2022-04-28 11:38:31 +02:00 |
|
Cayo Puigdefabregas
|
b11bb163a0
|
hide 2 trade buttons
|
2022-04-26 17:35:29 +02:00 |
|
Santiago L
|
b0f9a83dce
|
Merge pull request #232 from RubenPX/fix-max-lots-list
[Change] Set max lots list to 20
|
2022-04-25 11:29:04 +02:00 |
|
RubenPX
|
e48a6c1ae4
|
set max lots list to 20
|
2022-04-25 11:19:55 +02:00 |
|
RubenPX
|
740af8f7b6
|
Style fix show lots as list
|
2022-04-21 19:53:09 +02:00 |
|
RubenPX
|
22ddea4a43
|
Merge branch 'testing' into change/frontend-fixes
|
2022-04-19 10:42:51 +02:00 |
|
Cayo Puigdefabregas
|
379a2efca2
|
errors in snapshots
|
2022-04-13 20:15:40 +02:00 |
|
Cayo Puigdefabregas
|
a0a52d8248
|
view list for snapshot errors
|
2022-04-13 18:31:39 +02:00 |
|
RubenPX
|
c256936b7d
|
fix trade lots modal
|
2022-04-13 13:27:38 +02:00 |
|
RubenPX
|
d985744fb8
|
fix device list padding
|
2022-04-12 13:19:56 +02:00 |
|
RubenPX
|
23d8ba1570
|
fix lot buttons
|
2022-04-12 12:57:46 +02:00 |
|
RubenPX
|
cb1f4377d6
|
Fix button spacing
|
2022-04-12 12:44:24 +02:00 |
|
RubenPX
|
89647f6ed5
|
Remove unused views
|
2022-04-12 12:41:05 +02:00 |
|
RubenPX
|
c910e0f7c0
|
Avoid hide dropdown when user clicked inside
|
2022-04-12 11:38:31 +02:00 |
|
Santiago L
|
4065f46dd9
|
Merge branch 'testing' into PR-lots-list
|
2022-04-11 16:19:23 +02:00 |
|
RubenPX
|
e7dbb34315
|
Moved api lines to fork with others features branches
Future freature (Search feature)
|
2022-04-11 11:25:30 +02:00 |
|
RubenPX
|
06456b352f
|
Refactor to reduche changes code
|
2022-04-11 10:42:56 +02:00 |
|
RubenPX
|
26275552c5
|
Select all functionality
|
2022-04-08 12:40:50 +02:00 |
|
RubenPX
|
9489a70597
|
Fixed currentuser.token
It needs ":" at finally of string
|
2022-04-07 14:24:09 +02:00 |
|
RubenPX
|
184d22ac81
|
Fix User token
Needs encode string to Base64
|
2022-04-07 14:12:20 +02:00 |
|
RubenPX
|
629a773dd2
|
Add reactive lots list
|
2022-04-07 13:28:07 +02:00 |
|
Santiago L
|
277c3a84a9
|
Rename removelot.html -> lot_delete_modal.html
|
2022-04-05 11:49:47 +02:00 |
|
Santiago L
|
64182403a2
|
UI: update button colors
|
2022-04-05 11:47:12 +02:00 |
|
Santiago L
|
82cea04625
|
Sort lot action's buttons
|
2022-04-05 11:46:31 +02:00 |
|
Santiago L
|
c9068385c3
|
Update icons of device buttons
|
2022-04-05 11:40:23 +02:00 |
|
Cayo Puigdefabregas
|
7a532fb02c
|
change label for labels
|
2022-03-31 16:12:35 +02:00 |
|
Cayo Puigdefabregas
|
aa5d93cf48
|
modularize labels instead of tags into inventory
|
2022-03-31 14:04:16 +02:00 |
|
Cayo Puigdefabregas
|
f8e1776ca8
|
Change names tags for labels in the labels sections
|
2022-03-17 09:41:03 +01:00 |
|
Cayo Puigdefabregas
|
a36fb0b0fc
|
generate pdf with multiple devices
|
2022-03-16 14:27:55 +01:00 |
|
Cayo Puigdefabregas
|
a8df3f5e5a
|
Render a template for get a labels of multiple devices
|
2022-03-16 13:06:42 +01:00 |
|
Santiago L
|
754f75eab4
|
Rename base URL 'inventory.devices' => 'inventory'
|
2022-03-15 14:33:27 +01:00 |
|
Santiago L
|
678dfb0ea9
|
Refactor filter form HTML markup
Avoid using row & col
|
2022-03-15 10:59:55 +01:00 |
|
Cayo Puigdefabregas
|
d20bd63cae
|
precommit
|
2022-03-15 10:02:30 +01:00 |
|
Cayo Puigdefabregas
|
71926f01c0
|
new list of device for filter
|
2022-03-15 09:16:01 +01:00 |
|
Cayo Puigdefabregas
|
40abcd6b67
|
pre commit
|
2022-03-09 10:30:28 +01:00 |
|
Cayo Puigdefabregas
|
2f84aac7ef
|
change the title of list when there are a select data in the filter
|
2022-03-08 17:59:33 +01:00 |
|
Cayo Puigdefabregas
|
0bef1dee2a
|
adding a new device in a lot if it is created from a lot
|
2022-03-08 17:43:15 +01:00 |
|
Cayo Puigdefabregas
|
70f093e1a1
|
resolve conflict
|
2022-03-08 10:30:31 +01:00 |
|
Santiago L
|
46a3fc57dd
|
Replace add supplier & add receiver pictograms
Create visual relation between:
a) Supplier and incoming lot
b) Receiver and outgoing lot
|
2022-03-07 18:30:32 +01:00 |
|
Santiago L
|
bb588b10d2
|
Refactor HTML: use d-flex
|
2022-03-07 18:28:45 +01:00 |
|
Cayo Puigdefabregas
|
598b91e22b
|
filter search in lists
|
2022-03-07 13:07:26 +01:00 |
|
Cayo Puigdefabregas
|
5df74d7742
|
extra message confirm when you want delete one lot with devices
|
2022-03-07 11:24:02 +01:00 |
|
Cayo Puigdefabregas
|
4fbed3c5ef
|
drop class col in forms when is not neccesary
|
2022-03-04 18:50:47 +01:00 |
|
Cayo Puigdefabregas
|
496763473e
|
always show the button to delete a lot and show an error message if you try to delete a lot with devices
|
2022-03-04 18:30:14 +01:00 |
|
Cayo Puigdefabregas
|
6b3ccee58f
|
#2890
Go back to lot detail when cancel lot edit
|
2022-03-04 13:51:05 +01:00 |
|
Cayo Puigdefabregas
|
b737aaf50a
|
add verbose_name in device.model instead of use template system
|
2022-03-04 13:31:33 +01:00 |
|
Cayo Puigdefabregas
|
95a8b13a6b
|
form select type of device in the list of device. Step 1
|
2022-03-04 13:00:51 +01:00 |
|
Cayo Puigdefabregas
|
c52480231b
|
add error msg when there are more than one device selected for add or remove one tag
|
2022-03-02 13:08:23 +01:00 |
|
Cayo Puigdefabregas
|
ab89b7eff0
|
#2736 Move simple-datatables to base
|
2022-03-01 10:30:47 +01:00 |
|
Cayo Puigdefabregas
|
3886076f50
|
#2736 Move jquery to base
|
2022-03-01 10:07:05 +01:00 |
|
Cayo Puigdefabregas
|
f9840e9f2b
|
fix buttons of form of upload trade document
|
2022-02-28 13:33:03 +01:00 |
|
Cayo Puigdefabregas
|
823594dce4
|
add tab documents
|
2022-02-28 13:27:12 +01:00 |
|
Cayo Puigdefabregas
|
b6cf1f1e3e
|
Merge branch 'feature/server-side-render' into feature/server-side-render-UX-improvements
|
2022-02-28 13:06:04 +01:00 |
|
Cayo Puigdefabregas
|
9a95587cf3
|
remove lot in top
|
2022-02-28 13:05:36 +01:00 |
|
Cayo Puigdefabregas
|
c6538333f7
|
task #2739 Manufacter and Model empty instead of None
|
2022-02-28 12:02:56 +01:00 |
|
Cayo Puigdefabregas
|
692358c343
|
add alert when no there are any device selected
|
2022-02-28 11:19:22 +01:00 |
|
Cayo Puigdefabregas
|
179feaba44
|
add exports in front end
|
2022-02-24 14:15:58 +01:00 |
|
Cayo Puigdefabregas
|
83a9c66a46
|
show documents in list device of trade lot
|
2022-02-21 13:04:56 +01:00 |
|
Cayo Puigdefabregas
|
bda39d0fc9
|
add trade document template
|
2022-02-21 13:04:13 +01:00 |
|
Cayo Puigdefabregas
|
d056d1867b
|
fix template trade
|
2022-02-21 13:03:35 +01:00 |
|
Cayo Puigdefabregas
|
791d2a5894
|
manager better the error messages in trade form
|
2022-02-18 13:37:45 +01:00 |
|
Cayo Puigdefabregas
|
a2b074e707
|
problem display none for adding tag form
|
2022-02-18 11:18:54 +01:00 |
|
Cayo Puigdefabregas
|
8b27b18fc1
|
change supplier for user_from and receiver for user_to
|
2022-02-18 09:30:20 +01:00 |
|
Cayo Puigdefabregas
|
f3ffcd89ca
|
fixing js form for trade
|
2022-02-10 13:22:47 +01:00 |
|
Cayo Puigdefabregas
|
cd16baaadb
|
skeleton for trade action
|
2022-02-09 14:06:28 +01:00 |
|
Cayo Puigdefabregas
|
f2d6c198cc
|
fix css for form documents into data_wipe html
|
2022-02-09 11:28:57 +01:00 |
|
Cayo Puigdefabregas
|
8b467b95c3
|
template for data wipe
|
2022-02-07 14:01:38 +01:00 |
|
Cayo Puigdefabregas
|
a55944e379
|
check the checkbox in a devices list when one form is invalid
|
2022-02-04 13:16:27 +01:00 |
|
Cayo Puigdefabregas
|
662f75bb7b
|
refactoring and put again the lot in form of actions
|
2022-02-04 12:10:27 +01:00 |
|
Cayo Puigdefabregas
|
f011e29ce9
|
add description of device in actions
|
2022-02-04 11:30:29 +01:00 |
|
Cayo Puigdefabregas
|
c10a5f24b4
|
add count to allocate action
|
2022-02-03 14:05:15 +01:00 |
|
Cayo Puigdefabregas
|
7f9a6784e9
|
add count of devices in action form
|
2022-02-03 13:58:54 +01:00 |
|
Cayo Puigdefabregas
|
aeef04b92c
|
change modal-fullscreen by modal-lg
|
2022-02-03 11:53:18 +01:00 |
|
Cayo Puigdefabregas
|
820078dd3f
|
UX: inform user about the type action thas is going to be created --> show type of action
|
2022-02-03 11:44:51 +01:00 |
|
Cayo Puigdefabregas
|
e8b5c1e310
|
deactive dataWipe action
|
2022-02-03 10:51:48 +01:00 |
|
Cayo Puigdefabregas
|
4107d67832
|
fix css bug for dropdown menu action
|
2022-02-03 10:28:15 +01:00 |
|
Cayo Puigdefabregas
|
87faee3444
|
fix the return correct page when the submit is false
|
2022-02-03 10:14:10 +01:00 |
|
Cayo Puigdefabregas
|
c0918e7b57
|
fix error message in form
|
2022-02-02 14:17:42 +01:00 |
|
Cayo Puigdefabregas
|
8149d0ed7c
|
reversed actions for see the better the traceability log
|
2022-02-02 13:27:53 +01:00 |
|
Cayo Puigdefabregas
|
bd5ab802cd
|
resolve conflict
|
2022-02-02 13:05:55 +01:00 |
|
Cayo Puigdefabregas
|
a0bc745893
|
drop lot in template of actions
|
2022-02-02 12:50:59 +01:00 |
|
Santiago L
|
f22fd4ebcb
|
Fix button links of device_list & page titles
|
2022-02-02 12:21:30 +01:00 |
|
Santiago L
|
c9a46128df
|
Set page_title & fix breadcrumb
|
2022-02-02 11:41:29 +01:00 |
|
Santiago L
|
44a38d4dec
|
Fix printerType select style
|
2022-02-02 11:18:16 +01:00 |
|
Cayo Puigdefabregas
|
10c756a884
|
show error msg for forms with errors of validations
|
2022-02-01 13:40:06 +01:00 |
|
Cayo Puigdefabregas
|
65a774550e
|
resolv conflicts
|
2022-01-31 10:41:40 +01:00 |
|
Cayo Puigdefabregas
|
05b4353cc4
|
add label code in tag
|
2022-01-31 10:12:44 +01:00 |
|
Cayo Puigdefabregas
|
999cd3e26c
|
try printpdf
|
2022-01-28 12:29:49 +01:00 |
|
Cayo Puigdefabregas
|
2840c5c21e
|
manager control over form of print tag
|
2022-01-28 11:03:57 +01:00 |
|
Cayo Puigdefabregas
|
c8eea3f072
|
template of unamed, template of tag details, qr print
|
2022-01-27 14:13:20 +01:00 |
|
Cayo Puigdefabregas
|
eb3e7e8a95
|
add link to tag details
|
2022-01-26 13:59:10 +01:00 |
|
Cayo Puigdefabregas
|
0f30bbda35
|
Merge branch 'feature/server-side-render' into feature/server-side-render-tags
|
2022-01-26 13:16:56 +01:00 |
|
Cayo Puigdefabregas
|
2327fa5a89
|
add an unnamed tag
|
2022-01-26 13:16:18 +01:00 |
|
Cayo Puigdefabregas
|
0d166b2b0c
|
refactor responses bool and fix name is_incoming
|
2022-01-26 11:31:00 +01:00 |
|
Cayo Puigdefabregas
|
fd4fc71bf5
|
fix id devices in form of add tag in device
|
2022-01-26 10:59:13 +01:00 |
|
Cayo Puigdefabregas
|
9b87a7415e
|
remove tag from device
|
2022-01-25 14:39:15 +01:00 |
|
Cayo Puigdefabregas
|
9d3f288213
|
template for link a tag with a device
|
2022-01-25 12:54:11 +01:00 |
|
Cayo Puigdefabregas
|
5eb2b0ee5f
|
link a tag with one device
|
2022-01-25 12:53:36 +01:00 |
|
Cayo Puigdefabregas
|
01b355d955
|
add links to devices
|
2022-01-25 10:54:33 +01:00 |
|
Cayo Puigdefabregas
|
55ce612b2a
|
resolv conflict
|
2022-01-25 10:37:30 +01:00 |
|
Cayo Puigdefabregas
|
959ee18f59
|
fix error messages and imei meid fields
|
2022-01-24 13:48:16 +01:00 |
|
Cayo Puigdefabregas
|
f497cc03e5
|
save a new device and validations
|
2022-01-20 13:13:20 +01:00 |
|
Cayo Puigdefabregas
|
f35dab8983
|
render the correct form in a new page
|
2022-01-19 13:40:40 +01:00 |
|
Cayo Puigdefabregas
|
c300e44eab
|
add a link for a new device, and snapshot
|
2022-01-18 13:47:17 +01:00 |
|
Cayo Puigdefabregas
|
f738abfab0
|
put more space in the card
|
2022-01-18 11:23:18 +01:00 |
|
Cayo Puigdefabregas
|
7b357ec2fc
|
fix template with results
|
2022-01-17 14:18:16 +01:00 |
|
Cayo Puigdefabregas
|
22623a4602
|
snapshot template
|
2022-01-14 11:12:07 +01:00 |
|
Cayo Puigdefabregas
|
68269c4b21
|
device details
|
2022-01-13 16:08:55 +01:00 |
|
Cayo Puigdefabregas
|
2cfe8a44c6
|
fix order of tags and change code for id
|
2022-01-12 20:45:49 +01:00 |
|
Cayo Puigdefabregas
|
aba5b9dc3b
|
confirmation dialog when deleting a lot
|
2022-01-12 20:26:14 +01:00 |
|
Cayo Puigdefabregas
|
e0e4ecfd2d
|
replace Temporal for Temporary
|
2022-01-12 16:52:55 +01:00 |
|
Cayo Puigdefabregas
|
387a37ecfe
|
add template allocate
|
2022-01-11 13:42:38 +01:00 |
|
Cayo Puigdefabregas
|
849e482d62
|
add named tags
|
2022-01-11 13:42:01 +01:00 |
|
Cayo Puigdefabregas
|
4e43076c04
|
add tag list
|
2022-01-11 13:13:57 +01:00 |
|
Cayo Puigdefabregas
|
5eb8a5a4b9
|
allocate formulary
|
2022-01-10 15:53:11 +01:00 |
|
Cayo Puigdefabregas
|
b191b155fd
|
action form standart
|
2022-01-10 13:07:05 +01:00 |
|
Cayo Puigdefabregas
|
a2c3741002
|
fix click in modal action page
|
2022-01-10 10:33:41 +01:00 |
|
Cayo Puigdefabregas
|
fd00a3ec34
|
add view, lot and type in formulary new action
|
2022-01-05 16:00:13 +01:00 |
|
Cayo Puigdefabregas
|
7d341c7d64
|
adding rendering template for new action
|
2022-01-05 12:13:44 +01:00 |
|
Cayo Puigdefabregas
|
483f674957
|
adding edit lot and fix bug of session.commit
|
2022-01-05 11:10:32 +01:00 |
|
Cayo Puigdefabregas
|
18fead559c
|
first step for render actions view
|
2022-01-04 12:56:28 +01:00 |
|
Cayo Puigdefabregas
|
5b9a9d482d
|
template necessary for create a new lot
|
2022-01-03 13:41:24 +01:00 |
|
Cayo Puigdefabregas
|
1acd3c4929
|
refactoring actions of javascript
|
2022-01-03 13:40:30 +01:00 |
|
Cayo Puigdefabregas
|
5bfe1584b9
|
add actions in menu New actions
|
2022-01-03 13:25:35 +01:00 |
|
Cayo Puigdefabregas
|
d994cd2f10
|
remove lot
|
2022-01-03 12:28:42 +01:00 |
|
Cayo Puigdefabregas
|
d17114a0b0
|
remove device from a lot
|
2022-01-03 11:32:12 +01:00 |
|
Cayo Puigdefabregas
|
b730537cde
|
add lot name in the breadcrumb
|
2021-12-30 22:39:56 +01:00 |
|
Cayo Puigdefabregas
|
8411a005df
|
adding csrf_token to addinglot.html
|
2021-12-30 13:54:14 +01:00 |
|
Cayo Puigdefabregas
|
94bf3aaf87
|
management of the form of adding a device in a batch from the frontend
|
2021-12-30 12:41:37 +01:00 |
|
Cayo Puigdefabregas
|
a5a08a162c
|
adding lots in to modal addinglot form
|
2021-12-29 13:44:28 +01:00 |
|
Cayo Puigdefabregas
|
f0dd2fb4ec
|
adding modal menu in for lots
|
2021-12-29 13:02:39 +01:00 |
|
Cayo Puigdefabregas
|
8591af5abd
|
adding buttons of lots actions exports and tags with dropdown menu
|
2021-12-29 12:14:29 +01:00 |
|
Cayo Puigdefabregas
|
2ea5c875c1
|
table with search and ordering fields
|
2021-12-29 10:57:39 +01:00 |
|
Cayo Puigdefabregas
|
e0de5c018c
|
changes order the input checkbox in the devices table
|
2021-12-29 10:13:03 +01:00 |
|
Cayo Puigdefabregas
|
1da6484f26
|
adding table
|
2021-12-28 14:14:02 +01:00 |
|
Cayo Puigdefabregas
|
c8be2bb640
|
adding rendering list
|
2021-12-28 13:55:56 +01:00 |
|
Cayo Puigdefabregas
|
ed48df70db
|
adding templates for inventory1
|
2021-12-28 12:36:02 +01:00 |