Cayo Puigdefabregas
|
497e29a2da
|
add manual binding
|
2022-07-28 17:48:14 +02:00 |
|
Cayo Puigdefabregas
|
924d9941bc
|
resolve conflict
|
2022-07-20 12:28:08 +02:00 |
|
Cayo Puigdefabregas
|
5d573e2305
|
Deactivate 'Devices Lots Spreadsheet' in unassigned list
|
2022-07-20 11:31:54 +02:00 |
|
Cayo Puigdefabregas
|
376021470c
|
allow device_details without placeholder
|
2022-07-18 12:56:33 +02:00 |
|
Cayo Puigdefabregas
|
2b5ff4cb2f
|
add placeholder details in detail of device
|
2022-07-15 16:47:39 +02:00 |
|
Cayo Puigdefabregas
|
d4824a4333
|
add placeholder log in form
|
2022-07-07 13:10:05 +02:00 |
|
Cayo Puigdefabregas
|
bc8944a498
|
add manual edit placeholder
|
2022-07-05 18:09:47 +02:00 |
|
Cayo Puigdefabregas
|
71518ca2a5
|
add upload form placeholder
|
2022-07-04 11:26:24 +02:00 |
|
Cayo Puigdefabregas
|
3dae7e3a58
|
ux menu
|
2022-06-29 17:31:54 +02:00 |
|
Cayo Puigdefabregas
|
3e2ed58b07
|
add number of devices to be created
|
2022-06-29 13:40:00 +02:00 |
|
Cayo Puigdefabregas
|
01e1d6e0b7
|
add computers as placeholders
|
2022-06-29 11:51:03 +02:00 |
|
Cayo Puigdefabregas
|
d2924dfafe
|
add fields in template
|
2022-06-28 17:38:31 +02:00 |
|
Cayo Puigdefabregas
|
9829ebe7c7
|
add download snapshots
|
2022-06-24 15:05:38 +02:00 |
|
Cayo Puigdefabregas
|
8bcbf21abe
|
resolve conflicts
|
2022-06-23 17:08:07 +02:00 |
|
Cayo Puigdefabregas
|
e55c1d4cab
|
change link of export devices lots
|
2022-06-23 15:52:23 +02:00 |
|
Cayo Puigdefabregas
|
e332cd2d43
|
add link to devices lot export
|
2022-06-20 10:36:24 +02:00 |
|
Cayo Puigdefabregas
|
cdf180cf38
|
drop metrics of devices list
|
2022-06-17 12:16:01 +02:00 |
|
Cayo Puigdefabregas
|
41196ae445
|
add system uuid to snapshots list
|
2022-06-15 13:39:06 +02:00 |
|
Cayo Puigdefabregas
|
eb66baf842
|
fix snapshot_uuid == None
|
2022-06-07 15:12:13 +02:00 |
 Santiago L
|
083e763b25
|
Merge pull request #212 from eReuse/feature/server-side-render-parser-3021
Feature/server side render parser 3021
|
2022-06-07 11:00:27 +02:00 |
cayop
|
65d500c87d
|
Merge pull request #293 from eReuse/feature/3428-Increase-items-selected
increase 50 and 100 items per page
|
2022-06-07 09:35:30 +02:00 |
|
Cayo Puigdefabregas
|
c615980535
|
increase 50 and 100 items per page
|
2022-06-06 18:25:56 +02:00 |
|
Santiago L
|
772d527ba6
|
Merge pull request #277 from RubenPX/add-developement-stuff-js
Add developement build & precomit build (javascript)
|
2022-06-06 16:45:10 +02:00 |
|
Cayo Puigdefabregas
|
83bdf79514
|
add render views for delivery and receiver notes
|
2022-06-06 13:37:58 +02:00 |
|
Cayo Puigdefabregas
|
e635abdbbc
|
views of delivery note and receiver note
|
2022-06-03 20:01:13 +02:00 |
|
Cayo Puigdefabregas
|
88a0bdd44d
|
resolv conflicts
|
2022-06-03 11:34:49 +02:00 |
|
Cayo Puigdefabregas
|
ad7848edc6
|
add snapshotLog in old api
|
2022-06-03 11:06:49 +02:00 |
|
Cayo Puigdefabregas
|
cce7dbfdf1
|
add view for advanced search
|
2022-06-02 13:46:10 +02:00 |
|
Cayo Puigdefabregas
|
f58993c9d1
|
resolve conflicts
|
2022-06-01 15:01:02 +02:00 |
|
Cayo Puigdefabregas
|
29313e3470
|
add colors to open and closed
|
2022-06-01 13:26:17 +02:00 |
|
Cayo Puigdefabregas
|
96680937e9
|
add arrow right
|
2022-06-01 13:14:27 +02:00 |
|
Cayo Puigdefabregas
|
e1e38015ee
|
fix
|
2022-06-01 12:34:48 +02:00 |
|
Cayo Puigdefabregas
|
f8f1276313
|
add description in transfer
|
2022-06-01 11:09:28 +02:00 |
|
Cayo Puigdefabregas
|
dbd5645c94
|
show transfers if there are transfer
|
2022-05-31 16:28:38 +02:00 |
|
Cayo Puigdefabregas
|
9ca5ce48d1
|
add edit transfer
|
2022-05-30 16:32:25 +02:00 |
|
Cayo Puigdefabregas
|
a8368e92b8
|
add html and form for transfers
|
2022-05-27 16:32:22 +02:00 |
|
Cayo Puigdefabregas
|
ebe800158a
|
modify updated and add registered
|
2022-05-25 17:37:24 +02:00 |
|
Cayo Puigdefabregas
|
83067fd2bb
|
modify updated and add registered
|
2022-05-25 17:33:54 +02:00 |
|
Santiago L
|
7d7507c1d9
|
Merge pull request #273 from RubenPX/feature/lots-search
Feature: lots-search US 3334
|
2022-05-23 13:39:42 +02:00 |
RubenPX
|
c0a7415f33
|
Update ereuse_devicehub/templates/inventory/device_list.html
Co-authored-by: Santiago L <santiago@ribaguifi.com>
|
2022-05-21 10:58:40 +02:00 |
|
Cayo Puigdefabregas
|
6ecbd4e09d
|
add details of one entry snapshot log
|
2022-05-19 18:16:47 +02:00 |
|
Cayo Puigdefabregas
|
744b14f286
|
join all snapshots logs in one for every uuid
|
2022-05-19 13:48:52 +02:00 |
|
Cayo Puigdefabregas
|
0bc75ec547
|
add get_status
|
2022-05-18 18:26:01 +02:00 |
|
Cayo Puigdefabregas
|
04969ad939
|
clean template
|
2022-05-18 18:02:38 +02:00 |
|
Cayo Puigdefabregas
|
c0abfd6f0b
|
change version
|
2022-05-18 12:46:57 +02:00 |
|
RubenPX
|
79ce3dfc59
|
Load dev build on device_list
|
2022-05-18 11:16:22 +02:00 |
|
Cayo Puigdefabregas
|
99309162e3
|
change templates
|
2022-05-18 11:01:23 +02:00 |
|
Cayo Puigdefabregas
|
bf547b6f80
|
Merge branch 'feature/server-side-render-parser-3021' into feature/list-snapshots-view-#3113
|
2022-05-17 09:23:31 +02:00 |
|
Cayo Puigdefabregas
|
d935c987b3
|
comiter monitor instead of monitor
|
2022-05-16 12:40:14 +02:00 |
|
Cayo Puigdefabregas
|
727c06c3de
|
add public link to device list
|
2022-05-16 11:54:02 +02:00 |
|
Cayo Puigdefabregas
|
c1665ef4af
|
Merge branch 'testing' into feature/#3396-add-columns-status
|
2022-05-16 10:16:23 +02:00 |
|
RubenPX
|
adde4f88e4
|
add lots search interface
|
2022-05-13 21:27:50 +02:00 |
|
Cayo Puigdefabregas
|
11913d68c3
|
fix state instead of states
|
2022-05-13 17:16:08 +02:00 |
|
Cayo Puigdefabregas
|
1dcebc0112
|
#3401 change the values of the status in the page of device details
|
2022-05-13 13:11:00 +02:00 |
|
Cayo Puigdefabregas
|
d8c9bcbcf7
|
#3400 change the names of the status for the correct names
|
2022-05-13 13:06:04 +02:00 |
|
Cayo Puigdefabregas
|
1b5f6412f0
|
#3397 add columns of status in the devices list
|
2022-05-13 12:17:14 +02:00 |
|
Santiago L
|
af833a673a
|
Merge pull request #272 from RubenPX/Show-device-labels
Show lots on deviceList
|
2022-05-13 10:41:55 +02:00 |
|
Santiago L
|
56ccb7591a
|
Cosmetics: display lots inline & use ligh bg
Lower visual weight because it's secundary information
|
2022-05-13 10:39:37 +02:00 |
|
Santiago L
|
300edac5a8
|
Dropped .badge-pill use the .rounded-pill utility instead.
Breaking change on Boostrap 5
https://getbootstrap.com/docs/5.0/migration/#badges
|
2022-05-13 10:35:11 +02:00 |
|
Santiago L
|
a444579c05
|
Merge pull request #271 from eReuse/feature/all-device-list
Feature: 3196 all device list
|
2022-05-13 10:26:49 +02:00 |
|
RubenPX
|
6a408a08c7
|
set const table to var
This allow modify variable
|
2022-05-12 18:44:26 +02:00 |
|
cayop
|
5026768eb5
|
Merge pull request #269 from eReuse/bugfix/allocate-bugs
Bugfix/allocate bugs
|
2022-05-12 17:38:37 +02:00 |
|
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 |