Commit graph

1841 commits

Author SHA1 Message Date
Cayo Puigdefabregas 9800b48aa3 show dhi of placeholder in shapshot_log list 2022-08-05 16:52:56 +02:00
Cayo Puigdefabregas 1996e8fa7a new concept of status abstract of a device 2022-08-05 16:42:07 +02:00
Cayo Puigdefabregas ded8a23075 allow edit only phid on abstrac devices 2022-08-05 16:17:19 +02:00
Cayo Puigdefabregas 5d81db5b8c fix phid form upload 2022-08-05 15:50:03 +02:00
Cayo Puigdefabregas 8c1ea5786e add v14 iso for download erease settings 2022-08-05 11:07:54 +02:00
Cayo Puigdefabregas 43da3f0a4f resolve conflict 2022-08-04 18:25:02 +02:00
Cayo Puigdefabregas 6f87005f18 Merge branch 'master' into testing 2022-08-04 15:30:25 +02:00
Cayo Puigdefabregas 497d522ce8 new hello settings 2022-08-04 14:38:43 +02:00
Cayo Puigdefabregas a3a8f377f0 new settins page 2022-08-04 14:09:59 +02:00
Cayo Puigdefabregas d03850b278 fix migration only devices without placeholders 2022-08-03 18:41:58 +02:00
Cayo Puigdefabregas 1b5debc77f fix battery migration 2022-08-03 17:29:13 +02:00
Cayo Puigdefabregas dcc445a42e fix battery migration 2022-08-03 17:28:59 +02:00
Cayo Puigdefabregas beb687b967 add binding and unbinding tests 2022-08-03 16:00:25 +02:00
Cayo Puigdefabregas 829266a808 fix excess of line 2022-08-02 17:44:36 +02:00
Cayo Puigdefabregas 83519219c7 switch order of migration 2022-08-02 16:31:27 +02:00
Cayo Puigdefabregas 080fc039ec drop cascade own 2022-08-02 13:14:02 +02:00
Cayo Puigdefabregas 72b34b3330 resolve conflict 2022-08-02 12:58:26 +02:00
Cayo Puigdefabregas 9c2d52a7f7 fix cascade delete in placeholder 2022-08-02 12:41:31 +02:00
Cayo Puigdefabregas 5ba879d4b5 other type of quotes 2022-08-01 19:17:21 +02:00
Cayo Puigdefabregas 2a9b6864be resolve conflict 2022-08-01 17:23:27 +02:00
Cayo Puigdefabregas c6bbaa0460 add quotation for results of csv 2022-08-01 16:13:55 +02:00
Cayo Puigdefabregas 063d20695f add quotation for results of csv 2022-07-29 18:30:58 +02:00
Cayo Puigdefabregas 7e4deea7fe add unbinding 2022-07-29 17:02:27 +02:00
Cayo Puigdefabregas c98de60680 Merge branch 'testing' into feature/3598-binding 2022-07-29 10:05:49 +02:00
Cayo Puigdefabregas 637308ee8f drop required of imei and meid 2022-07-28 18:34:34 +02:00
Cayo Puigdefabregas b0beff5b1d commit validation imei for mobiles 2022-07-28 18:12:49 +02:00
Cayo Puigdefabregas 497e29a2da add manual binding 2022-07-28 17:48:14 +02:00
Cayo Puigdefabregas d008bb2921 resolve conflicts 2022-07-25 18:16:09 +02:00
Cayo Puigdefabregas d5588bc871 Merge branch 'bugfix/3666-label' into testing 2022-07-25 18:13:52 +02:00
cayop eea6d5c7e7
Merge pull request #321 from eReuse/bugfix/3666-label
Bugfix/3666 label
2022-07-25 18:06:07 +02:00
Cayo Puigdefabregas ac9708c779 fix unlink tags 2022-07-25 17:38:08 +02:00
Cayo Puigdefabregas 31bd4d775b fix fields number for print label 2022-07-25 17:37:00 +02:00
Cayo Puigdefabregas 8bec1fbd29 Merge branch 'change/3659-weekly-report' into testing 2022-07-25 16:03:08 +02:00
Cayo Puigdefabregas 429c9a1b15 add command cli: get_token 2022-07-22 17:49:51 +02:00
Cayo Puigdefabregas a74e242e20 add report command cli 2022-07-22 15:23:49 +02:00
Cayo Puigdefabregas 21dcb6c26d Merge branch 'testing' into feature/3598-binding 2022-07-21 16:46:22 +02:00
Lint Action 0d2edef437 Fix code style issues with ESLint 2022-07-21 14:49:02 +00:00
Cayo Puigdefabregas a7e1daca79 fix get id from js 2022-07-21 16:30:35 +02:00
Cayo Puigdefabregas 60e46fae7b drop check in dummy 2022-07-21 14:01:20 +02:00
Cayo Puigdefabregas d0bfb9644d add phid and tags in labels 2022-07-21 13:56:09 +02:00
Cayo Puigdefabregas 71efe63ca9 fix migration 2022-07-20 17:29:29 +02:00
Cayo Puigdefabregas 5d9928bd70 fixed tests 2022-07-20 14:58:32 +02:00
Cayo Puigdefabregas 7db53a5779 fix delete device 2022-07-20 12:39:21 +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 02404c4277 fix export placeholders 2022-07-20 11:19:45 +02:00
Cayo Puigdefabregas 2aafe9efcc remove add tag automaticaly 2022-07-20 10:33:44 +02:00
Cayo Puigdefabregas a2b9d1c96d drop filter only by wb device 2022-07-20 10:03:46 +02:00
Cayo Puigdefabregas e2870f2b3e fix 2b90b41a556a_create_placeholders by null enviroment 2022-07-19 19:02:21 +02:00
Cayo Puigdefabregas 1167b3cb1e fix tests 2022-07-19 18:40:27 +02:00
Cayo Puigdefabregas 3a3b403433 add and remove placeholders for snaposhot devices 2022-07-19 12:42:11 +02:00
Cayo Puigdefabregas 31abdf55e2 show only devices wb via api 2022-07-18 17:56:54 +02:00
Cayo Puigdefabregas a6c84ae588 fix dummy 2022-07-18 16:56:57 +02:00
Cayo Puigdefabregas e3a7684865 sync only wb devices 2022-07-18 16:56:35 +02:00
Cayo Puigdefabregas 376021470c allow device_details without placeholder 2022-07-18 12:56:33 +02:00
Cayo Puigdefabregas b039e491dc Merge branch 'testing' into feature/3598-binding 2022-07-18 11:54:11 +02:00
Cayo Puigdefabregas 26b322ba70 fix bug 2022-07-18 10:56:36 +02:00
Cayo Puigdefabregas 6a6c0e5182 show a error message creating placeholder device 2022-07-18 10:07:37 +02:00
Cayo Puigdefabregas 9e42ccafc0 change device for placeholders in lots 2022-07-15 18:07:39 +02:00
Cayo Puigdefabregas 2b5ff4cb2f add placeholder details in detail of device 2022-07-15 16:47:39 +02:00
Cayo Puigdefabregas 03fbfcb73b add device placeholder only in the list of devices 2022-07-15 16:47:00 +02:00
Cayo Puigdefabregas 1fa6e7512c fix tag automatic only for placeholder 2022-07-15 13:11:04 +02:00
Cayo Puigdefabregas 2c6f831068 add a placeholder when arrive a snapshot 2022-07-13 11:23:18 +02:00
Cayo Puigdefabregas 49ee618a6a Merge branch 'feature/3518-define-placeholder' into feature/3598-binding 2022-07-12 13:38:54 +02:00
Cayo Puigdefabregas fb31ce69bc fix models 2022-07-12 13:23:24 +02:00
Cayo Puigdefabregas 9936a89171 Merge branch 'feature/3518-define-placeholder' of github.com:eReuse/devicehub-teal into feature/3518-define-placeholder 2022-07-12 11:25:58 +02:00
Cayo Puigdefabregas e3ca632177 add components as placeholder 2022-07-12 11:23:55 +02:00
Santiago L e6accae694 Release version 2.3.0 2022-07-12 10:11:30 +02:00
Cayo Puigdefabregas 15a56a59ee fix flak8 2022-07-12 10:11:30 +02:00
Cayo Puigdefabregas a21018a2d2 add binding relation 2022-07-11 15:36:45 +02:00
Cayo Puigdefabregas 99238d69d8 resolve conflict 2022-07-11 09:35:03 +02:00
Cayo Puigdefabregas fa45080a44 fixed 2022-07-08 12:21:07 +02:00
Cayo Puigdefabregas da56126653 fixing schema 2022-07-07 17:43:46 +02:00
Cayo Puigdefabregas c9cd68b817 resolve conflict 2022-07-07 16:33:43 +02:00
Cayo Puigdefabregas 1eed2f5773 remove schema of placeholder 2022-07-07 16:32:00 +02:00
Cayo Puigdefabregas 4507a3206c add secuence and remove schema for placeholder_log 2022-07-07 16:18:51 +02:00
Cayo Puigdefabregas d4824a4333 add placeholder log in form 2022-07-07 13:10:05 +02:00
Cayo Puigdefabregas d93f040453 add placeholder log models 2022-07-06 18:37:27 +02:00
Cayo Puigdefabregas 3af2645706 fix format of file 2022-07-05 18:36:27 +02:00
Cayo Puigdefabregas e8b957c697 call one time all lots reset 2022-07-05 18:18:29 +02:00
Cayo Puigdefabregas 3a06ade79f call one time all lots 2022-07-05 18:10:17 +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 b22ea880dd fix add amount placeholder 2022-06-29 18:07:57 +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 16daba1fa5 add placeholder in sync function 2022-06-28 17:40:00 +02:00
Cayo Puigdefabregas c6e5d71e15 add placeholder in form 2022-06-28 17:39:08 +02:00
Cayo Puigdefabregas d2924dfafe add fields in template 2022-06-28 17:38:31 +02:00
Cayo Puigdefabregas 12d55c2d24 add models 2022-06-28 17:38:05 +02:00
Cayo Puigdefabregas 35ccb33f34 Merge branch 'testing' into feature/3518-define-placeholder 2022-06-27 09:46:32 +02:00
cayop 97d0dd1411
Merge pull request #307 from eReuse/feature/3530-download-snapshots
Feature/3530 download snapshots
2022-06-24 15:50:27 +02:00
Cayo Puigdefabregas 9829ebe7c7 add download snapshots 2022-06-24 15:05:38 +02:00
cayop 746df7e528
Merge pull request #306 from eReuse/feature/3439-wb-iso
fixing path
2022-06-24 12:43:36 +02:00
Cayo Puigdefabregas 72c19501fa fixing path 2022-06-24 12:39:46 +02:00
cayop 035ccc7315
Merge pull request #305 from eReuse/feature/3439-wb-iso
Feature/3439 wb iso
2022-06-24 12:03:49 +02:00
Cayo Puigdefabregas 2760348cc0 add iso dir 2022-06-24 11:45:26 +02:00
Cayo Puigdefabregas 1f85abc1e2 resolve conflicts 2022-06-24 11:32:14 +02:00
Cayo Puigdefabregas 18e051596c fixing system uuid as non physical property 2022-06-24 11:27:42 +02:00
Santiago L cd3439b3ac Release version 2.2.0 2022-06-24 07:22:01 +02:00
Cayo Puigdefabregas 7cb5c76562 add download iso 2022-06-23 18:08:56 +02:00
Cayo Puigdefabregas 6e3c032d97 3500 change name of anchor 2022-06-23 18:08:16 +02:00
Cayo Puigdefabregas 8bcbf21abe resolve conflicts 2022-06-23 17:08:07 +02:00
Cayo Puigdefabregas be7cbf02c0 remove system uuid of public page 2022-06-23 17:06:40 +02:00
Cayo Puigdefabregas e55c1d4cab change link of export devices lots 2022-06-23 15:52:23 +02:00
Cayo Puigdefabregas 2605d938e5 add placeholder model 2022-06-23 15:51:01 +02:00
Cayo Puigdefabregas bc446e7dbf run babel 2022-06-22 09:03:12 +02:00
Cayo Puigdefabregas b47cc84859 run babel 2022-06-21 18:27:55 +02:00
Lint Action db53905cf1 Fix code style issues with ESLint 2022-06-21 15:53:23 +00:00
Cayo Puigdefabregas fc50604011 add sections in menu of lots 2022-06-21 17:51:33 +02:00
Cayo Puigdefabregas cf4e1df527 add field type of transfer instead of change the name 2022-06-21 17:50:27 +02:00
Cayo Puigdefabregas 7d40f5b537 add transfer in name of lot 2022-06-21 16:40:21 +02:00
Cayo Puigdefabregas 2a3b7a0900 add Transfers to lot dropdown 2022-06-21 08:11:42 +02:00
Cayo Puigdefabregas 3ecf4c4a89 add dropdown menu in reports lots 2022-06-20 14:36:34 +02:00
Cayo Puigdefabregas c6c443899a add temporary lots too in reports 2022-06-20 14:35:57 +02:00
Cayo Puigdefabregas 8e11aff88b add export devices lots 2022-06-20 10:51:32 +02:00
Cayo Puigdefabregas 49062d9944 add export devices lots 2022-06-20 10:40:00 +02:00
Cayo Puigdefabregas e332cd2d43 add link to devices lot export 2022-06-20 10:36:24 +02:00
Cayo Puigdefabregas 740178f57b add link for report lots 2022-06-20 09:24:48 +02:00
Cayo Puigdefabregas ec47bfaec6 export lots 2022-06-17 14:14:32 +02:00
Cayo Puigdefabregas cdf180cf38 drop metrics of devices list 2022-06-17 12:16:01 +02:00
Cayo Puigdefabregas 3afdf3ea0b return to the original state of dummy 2022-06-17 11:25:24 +02:00
Cayo Puigdefabregas 559e926626 fix commit in db 2022-06-17 11:24:52 +02:00
Cayo Puigdefabregas 88a164a9ee save system uuid only for smbios >= 2.6 2022-06-16 17:58:32 +02:00
Cayo Puigdefabregas c43e7fb578 fix splits texts 2022-06-16 11:47:36 +02:00
Cayo Puigdefabregas 08300ef612 add system_uuid in old devices 2022-06-16 10:38:57 +02:00
Cayo Puigdefabregas 41196ae445 add system uuid to snapshots list 2022-06-15 13:39:06 +02:00
Cayo Puigdefabregas 77c01ae80a migration change uuid for system_uuid 2022-06-15 12:52:46 +02:00
Cayo Puigdefabregas 34def901cb change uuid in views and forms for system_uuid 2022-06-15 12:18:44 +02:00
Cayo Puigdefabregas 0f916e5964 change uuid for system_uuid 2022-06-15 12:17:16 +02:00
Cayo Puigdefabregas dd3ff2fc5a fix weird 2022-06-14 10:49:00 +02:00
Cayo Puigdefabregas c0081e32b1 fix uuid in device not computer 2022-06-14 10:48:01 +02:00
Cayo Puigdefabregas 86446a268c fix uuid in device not computer 2022-06-14 10:46:21 +02:00
Cayo Puigdefabregas 660e238468 fix order of vars declared 2022-06-13 17:59:54 +02:00
Cayo Puigdefabregas 3e3a2fbd34 add uuid for old versions from form upload 2022-06-13 17:36:03 +02:00
Cayo Puigdefabregas e1cdd56fa0 add uuid for old register api 2022-06-13 17:35:01 +02:00
Cayo Puigdefabregas 686d0a9307 add system_uuid to sync run function 2022-06-13 17:33:22 +02:00
Cayo Puigdefabregas dadfbdd605 add logo in printing pdf label 2022-06-09 16:57:15 +02:00
Cayo Puigdefabregas 3431bed49e managment save and load logo in template 2022-06-08 15:37:49 +02:00
Cayo Puigdefabregas c3fbc8a0c0 Merge branch 'testing' into feature/2972-add-logo-to-label 2022-06-08 12:27:06 +02:00
Cayo Puigdefabregas 328d417741 add upload logo in template 2022-06-08 12:26:47 +02:00
cayop cfe7639734
Merge pull request #300 from eReuse/change/2973-sid-in-label
Change/2973 sid in label
2022-06-08 12:18:42 +02:00
Cayo Puigdefabregas a65e93b470 add sid in template 2022-06-08 11:59:47 +02:00
Cayo Puigdefabregas dd68c5c410 fix dev.sid 2022-06-08 11:59:22 +02:00
Lint Action 8dbb4e6e9b Fix code style issues with ESLint 2022-06-08 08:56:46 +00:00
Cayo Puigdefabregas 2eab043f3c fix var 2022-06-08 10:55:52 +02:00
Cayo Puigdefabregas a1450f9810 fix var 2022-06-08 10:53:40 +02:00
Cayo Puigdefabregas 3997235e09 fix var 2022-06-08 10:52:52 +02:00
Lint Action 42df98f7a2 Fix code style issues with ESLint 2022-06-08 08:17:46 +00:00
Cayo Puigdefabregas 070771c077 select with shift chromium 2022-06-08 10:16:15 +02:00
Cayo Puigdefabregas 5932213764 save sid in html label 2022-06-08 09:26:09 +02:00
Cayo Puigdefabregas 99d0a61e87 return jwt.encode to snapshot code 2022-06-07 15:24:45 +02:00
Cayo Puigdefabregas eb66baf842 fix snapshot_uuid == None 2022-06-07 15:12:13 +02:00
Cayo Puigdefabregas 74f9b88ece preload SnapshotsLog in dummy 2022-06-07 15:06:18 +02:00
Cayo Puigdefabregas 7a0e21d682 dialects.postgresql.ENUM instead of sa.Enum 2022-06-07 15:05:39 +02:00
Santiago L 498ce6763d Release version 2.2.0rc1 2022-06-07 11:22:40 +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 2b8e7232c3 add transfer note models 2022-06-03 13:13:50 +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
cayop 9eb02e82a3
Merge pull request #290 from eReuse/feature/3436-search-bulk-dhid
add view for advanced search
2022-06-02 14:59:56 +02:00
Cayo Puigdefabregas cce7dbfdf1 add view for advanced search 2022-06-02 13:46:10 +02:00
Santiago L 560920c85a
Merge pull request #287 from RubenPX/fix/lots-button-out-of-card
fix apply button out of card
2022-06-02 13:26:05 +02:00
Cayo Puigdefabregas 5fc3056907 fix version transfer migration 2022-06-01 16:47:40 +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 1e50db9194 fix render lot 2022-06-01 13:15:04 +02:00
Cayo Puigdefabregas b7eb438767 fix migration datas 2022-06-01 13:14:45 +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 ef36c11f6b change names of vars 2022-06-01 11:54:02 +02:00
Cayo Puigdefabregas f8f1276313 add description in transfer 2022-06-01 11:09:28 +02:00
Cayo Puigdefabregas 7e4bdfdc69 create transfer in angular version for code trades 2022-06-01 10:29:55 +02:00
Cayo Puigdefabregas 2dd3b7c276 upgrade the datas in the migration 2022-05-31 18:33:41 +02:00
Cayo Puigdefabregas dbd5645c94 show transfers if there are transfer 2022-05-31 16:28:38 +02:00
Cayo Puigdefabregas 01f2996c48 fixed query lots 2022-05-31 15:14:56 +02:00
RubenPX 54295556f1 fix style 2022-05-31 11:25:32 +02:00
Cayo Puigdefabregas f6d4c48487 drop pdbs 2022-05-31 10:22:01 +02:00
RubenPX 5b164221ae hotfix lots search not working 2022-05-30 19:28:16 +02:00
Cayo Puigdefabregas a1728810d1 fixed bugs 2022-05-30 17:35:27 +02:00
Cayo Puigdefabregas b0c58595c1 add EditTransfer 2022-05-30 16:33:01 +02:00
Cayo Puigdefabregas 9ca5ce48d1 add edit transfer 2022-05-30 16:32:25 +02:00
Cayo Puigdefabregas 0f563d58d8 fix closed 2022-05-30 16:32:02 +02:00
Cayo Puigdefabregas b8819b7a4a change is_temporary, is_outgoing, is_incoming 2022-05-27 16:48:40 +02:00
Cayo Puigdefabregas b2e11527cb fix model transfer 2022-05-27 16:32:54 +02:00
Cayo Puigdefabregas a8368e92b8 add html and form for transfers 2022-05-27 16:32:22 +02:00
Cayo Puigdefabregas 0998adc956 add model transfer 2022-05-27 11:30:48 +02:00
Cayo Puigdefabregas d3e7c49a86 fixed bugs of allocate 2022-05-26 17:55:52 +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 c2bff5dd92 Fix #279. Update existing enum 2022-05-24 14:08:23 +02:00
Santiago L e081310069 Apply pre-commit hook 2022-05-24 14:06:56 +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
Lint Action 14500ec4a2 Fix code style issues with ESLint 2022-05-22 17:01:11 +00:00