verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

closes 4732 etiquetas con QR para previa y item #1163

Merged
pau merged 35 commits from 4732-previa-label into dev 2023-01-18 08:26:11 +00:00
Conversation 2 Commits 35 Files Changed 15 +243 -3590
pau commented 2022-11-21 12:57:53 +00:00
Contributor
Copy Link
No description provided.
pau added the
CR / Tests passed
 label 2022-11-21 12:57:53 +00:00
pau added 7 commits 2022-11-21 12:57:54 +00:00
gitea/salix/pipeline/head This commit looks good Details
99eea1df1d refs #4732 @1h
gitea/salix/pipeline/head This commit looks good Details
d41269bbbe Change fixtures so the provider is present in the label
gitea/salix/pipeline/head There was a failure building this commit Details
2567a1fab3 refs #4732 @4h30m
gitea/salix/pipeline/head This commit looks good Details
52630f0a25 add collections with sectorFk
pau added 1 commit 2022-11-25 06:35:17 +00:00
gitea/salix/pipeline/head This commit looks good Details
02f2724f2b Merge branch 'dev' into 4732-previa-label
pau added 2 commits 2022-11-28 13:34:23 +00:00
pau added 1 commit 2022-11-29 12:48:02 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
18a23cf8b5 add some right padding to prevent the printer from cutting the label
pau added 3 commits 2022-11-29 13:16:27 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
4e7ef47b88 SQL fixes
gitea/salix/pipeline/head There was a failure building this commit Details
92557ea22d Added version 10510
gitea/salix/pipeline/head There was a failure building this commit Details
cc87565190 Merge branch 'dev' into 4732-previa-label
pau added 1 commit 2022-11-30 06:14:05 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
cb7aa48fde Solve merge conflicts
pau added 1 commit 2022-11-30 06:21:38 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
25e58f4f66 fix merge conflicts
pau added 1 commit 2022-12-02 08:05:31 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
5235ed5499 Merge branch 'dev' into 4732-previa-label
pau added 1 commit 2022-12-19 06:31:00 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
cc6e2a8d01 remove package locks to avoid merge conflicts
pau added 59 commits 2022-12-19 06:47:34 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
1f857d5b10 4859 - Export production database
gitea/salix/pipeline/head There was a failure building this commit Details
6db1a9e8ae refs #4859 fix: fixtures db exportation
gitea/salix/pipeline/head This commit looks good Details
6b76804913 refs #4865 Sintaxis mensajes rocket
gitea/salix/pipeline/head There was a failure building this commit Details
8df7b91127 fix: entry ref
gitea/salix/pipeline/head There was a failure building this commit Details
2bb6c1c1da fix: borra registros aunq no tengan file adjunto
gitea/salix/pipeline/head This commit looks good Details
e815292d6b fix(componentUpdate): updated filter where sintax
gitea/salix/pipeline/head There was a failure building this commit Details
ede721a37b Merge branch 'master' into MASTER_hotfix_deleteTrashFiles3
gitea/salix/pipeline/head This commit looks good Details
e7173fe156 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
12cfa05696 fix(invoicePdf): invoice correction
gitea/salix/pipeline/head This commit looks good Details
48a7635449 refs #4893 regex changed
gitea/salix/pipeline/head This commit looks good Details
6562b68341 fix(agencyTerm): permitir decimales en m3 minimos
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
0c4ab815fd decimal
gitea/salix/pipeline/head This commit looks good Details
6128414685 m3 decimal
gitea/salix/pipeline/head There was a failure building this commit Details
ac447d4981 Updated SQL version nomenclature
gitea/salix/pipeline/head This commit looks good Details
af9d52a367 Merge branch 'master' into MASTER_hotfix_invoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
f7178f4e32 Merge pull request 'MASTER_hotfix_invoiceOut' (!1197) from MASTER_hotfix_invoiceOut into master 
Reviewed-on: #1197
gitea/salix/pipeline/head There was a failure building this commit Details
41b7b6ab06 Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket
gitea/salix/pipeline/head There was a failure building this commit Details
f93398c783 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
16d096d8ef Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket
gitea/salix/pipeline/head There was a failure building this commit Details
4cb8d8c763 test: enable one test and skip another
gitea/salix/pipeline/head There was a failure building this commit Details
158a71a326 restrictions
gitea/salix/pipeline/head This commit looks good Details
e000103ca4 Deleted version
gitea/salix/pipeline/head There was a failure building this commit Details
dc777ea69f Added version after merging to test
gitea/salix/pipeline/head There was a failure building this commit Details
d7a6350995 refs #4898 Created report expedition-pallet-label
gitea/salix/pipeline/head There was a failure building this commit Details
6ca8b646c2 refs #4898 Added userFk in QR
gitea/salix/pipeline/head This commit looks good Details
86a58a26ea Merge branch 'dev' into 4893-formato-correo
gitea/salix/pipeline/head There was a failure building this commit Details
1f0f5adcd8 Merge pull request 'fixes #4893 Comprobar formato del correo al insertar' (!1196) from 4893-formato-correo into dev 
Reviewed-on: #1196
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
8900656b14 Merge branch 'dev' into 4859-export_db
gitea/salix/pipeline/head There was a failure building this commit Details
1e0b0028f2 fix: only edit structure
gitea/salix/pipeline/head There was a failure building this commit Details
b7a369a41c refs #4204 Added param URL labelCount and 
changes in the css
gitea/salix/pipeline/head There was a failure building this commit Details
c14059df75 fix(supplier_consumption): fix JOIN
gitea/salix/pipeline/head There was a failure building this commit Details
d753243061 fix package.json
gitea/salix/pipeline/head There was a failure building this commit Details
a86636bee4 Use proper module codes
gitea/salix/pipeline/head This commit looks good Details
11db08b32b Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
76001ec022 refs #4204 labelCount argument not required
gitea/salix/pipeline/head This commit looks good Details
e6867f6004 Merge pull request '4898-expedition-pallet-label' (!1203) from 4898-expedition-pallet-label into dev 
Reviewed-on: #1203
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
3b9cd5be09 Merge pull request 'fixes #4859 export_db' (!1200) from 4859-export_db into dev 
Reviewed-on: #1200
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
c004a2917d Merge pull request 'refs #4204 Added param URL labelCount and' (!1204) from 4204-collection-label-labelCount into dev 
Reviewed-on: #1204
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
279456b377 Merge branch 'dev' into 4919-module_code
gitea/salix/pipeline/head There was a failure building this commit Details
fc69098c62 Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket
gitea/salix/pipeline/head This commit looks good Details
4b16b413dc fixes #4990 acquireTimeout to 60000
gitea/salix/pipeline/head This commit looks good Details
1fcf5a85a6 Merge pull request 'fixes #4990 acquireTimeout to 60000' (!1209) from 4990-fix-jenkins-backTests into dev 
Reviewed-on: #1209
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
31d7145c51 Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket
gitea/salix/pipeline/head This commit looks good Details
f9593b121f Merge pull request 'Use proper module codes' (!1206) from 4919-module_code into dev 
Reviewed-on: #1206
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
98b8d652cb Merge pull request 'refs #4865 Sintaxis mensajes rocket' (!1180) from 4865-sintaxis-mensajes-de-rocket into dev 
Reviewed-on: #1180
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
f652e86c78 Merge branch 'dev' into 4732-previa-label
pau added 1 commit 2022-12-19 06:50:39 +00:00
gitea/salix/pipeline/head This commit looks good Details
43b957cb9b Merge branch 'dev' into 4732-previa-label
pau requested review from joan 2022-12-19 12:27:00 +00:00
pau added 1 commit 2022-12-19 12:27:05 +00:00
gitea/salix/pipeline/head This commit looks good Details
6b3876b200 Merge branch 'dev' into 4732-previa-label
pau added 1 commit 2022-12-21 07:02:10 +00:00
gitea/salix/pipeline/head This commit looks good Details
1430749892 Merge branch 'dev' into 4732-previa-label
joan requested changes 2022-12-21 07:17:40 +00:00
back/methods/collection/previaLabelPdf.js Outdated
@ -0,0 +1,49 @@
const {Report} = require('vn-print');
module.exports = Self => {
Self.remoteMethodCtx('previaLabelPdf', {
joan commented 2022-12-21 07:07:32 +00:00
Contributor
Copy Link

previousLabel

previousLabel
pau marked this conversation as resolved
db/changes/224903/00-updateCollection.sql Outdated
@ -0,0 +1,3 @@
UPDATE vn.collection
joan commented 2022-12-21 07:08:51 +00:00
Contributor
Copy Link

Poner template strings y mover a la última versión SQL. Mirar canal #salix

Poner template strings y mover a la última versión SQL. Mirar canal #salix
pau marked this conversation as resolved
print/templates/reports/previa-label/previa-label.html Outdated
@ -0,0 +10,4 @@
</div>
</div>
<div class="data">
<div class="header">PREVIA</div>
joan commented 2022-12-21 07:11:22 +00:00
Contributor
Copy Link

Previous, añadir traducción

Previous, añadir traducción
pau marked this conversation as resolved
print/templates/reports/previa-label/previa-label.js Outdated
@ -0,0 +11,4 @@
this.barcode = await this.getBarcodeBase64(this.id);
if (!this.previa)
throw new Error('Something went wrong - previa');
joan commented 2022-12-21 07:14:17 +00:00
Contributor
Copy Link

Utilizar UserError tal como se acordó en la reunión

Utilizar UserError tal como se acordó en la reunión
pau marked this conversation as resolved
print/templates/reports/previa-label/previa-label.js
@ -0,0 +13,4 @@
if (!this.previa)
throw new Error('Something went wrong - previa');
if (!this.sector)
joan commented 2022-12-21 07:16:56 +00:00
Contributor
Copy Link

Debería ser solo necesario manejar la entidad principal y el informe ser capaz de funcionar sin el sector

Debería ser solo necesario manejar la entidad principal y el informe ser capaz de funcionar sin el sector
pau marked this conversation as resolved
joan requested review from guillermo 2022-12-21 07:17:58 +00:00
joan commented 2022-12-21 07:19:17 +00:00
Contributor
Copy Link

@guillermo Revisa el archivo:
print/templates/reports/previa-label/previa-label.html

No debería estar dentro del report-body, verdad? Me suena que esto te daba problemas al imprimir.

@guillermo Revisa el archivo: print/templates/reports/previa-label/previa-label.html No debería estar dentro del report-body, verdad? Me suena que esto te daba problemas al imprimir.
pau added 2 commits 2022-12-22 07:00:46 +00:00
pau added 1 commit 2022-12-22 09:49:59 +00:00
pau added 1 commit 2022-12-26 06:12:28 +00:00
gitea/salix/pipeline/head This commit looks good Details
7a5993b4fe Merge branch 'dev' into 4732-previa-label
pau added 1 commit 2022-12-29 09:03:13 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
21cd2e2a63 Merge branch 'dev' into 4732-previa-label
pau added 1 commit 2023-01-05 12:48:11 +00:00
gitea/salix/pipeline/head This commit looks good Details
4ae903191a Merge branch 'dev' into 4732-previa-label
pau added 2 commits 2023-01-05 13:40:39 +00:00
pau requested review from joan 2023-01-05 13:52:34 +00:00
joan approved these changes 2023-01-12 07:45:39 +00:00
pau added 1 commit 2023-01-12 12:30:05 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
dfd264ff82 Merge branch 'dev' into 4732-previa-label
guillermo requested changes 2023-01-12 12:40:22 +00:00
print/templates/reports/previa-label/assets/css/style.css
@ -0,0 +6,4 @@
font-size: 1.2em;
font-family: Arial, Helvetica, sans-serif;
}
guillermo commented 2023-01-12 12:37:56 +00:00
Member
Copy Link

Yo quitaría los saltos de línea entre etiquetas, de forma que quede el código más compacto.

Ejemplo:

label {
    font-size: 1.2em;
    font-family: Arial, Helvetica, sans-serif;
}
label2 {
    font-size: 1.2em;
    font-family: Arial, Helvetica, sans-serif;
}
label3 {
    font-size: 1.2em;
    font-family: Arial, Helvetica, sans-serif;
}
Yo quitaría los saltos de línea entre etiquetas, de forma que quede el código más compacto. *Ejemplo*: ``` label { font-size: 1.2em; font-family: Arial, Helvetica, sans-serif; } label2 { font-size: 1.2em; font-family: Arial, Helvetica, sans-serif; } label3 { font-size: 1.2em; font-family: Arial, Helvetica, sans-serif; } ```
pau marked this conversation as resolved
print/templates/reports/previa-label/sql/sector.sql Outdated
@ -0,0 +1,9 @@
select
`s`.`description`
guillermo commented 2023-01-12 12:40:18 +00:00
Member
Copy Link

Aquí formatearía bien el SQL, ya que no cumple con los estándares acordados, aquí tienes la página de la wiki: https://wiki.verdnatura.es/index.php/Convenciones_SQL

Aquí formatearía bien el SQL, ya que no cumple con los estándares acordados, aquí tienes la página de la wiki: https://wiki.verdnatura.es/index.php/Convenciones_SQL
pau marked this conversation as resolved
guillermo commented 2023-01-12 12:42:13 +00:00
Member
Copy Link

@guillermo Revisa el archivo:
print/templates/reports/previa-label/previa-label.html

No debería estar dentro del report-body, verdad? Me suena que esto te daba problemas al imprimir.

Correcto, ya hablé con el.

> @guillermo Revisa el archivo: > print/templates/reports/previa-label/previa-label.html > > No debería estar dentro del report-body, verdad? Me suena que esto te daba problemas al imprimir. Correcto, ya hablé con el.
pau added 1 commit 2023-01-12 12:54:46 +00:00
gitea/salix/pipeline/head This commit looks good Details
176005fcdc requested changes
pau requested review from guillermo 2023-01-12 13:10:26 +00:00
guillermo requested changes 2023-01-12 14:18:18 +00:00
print/templates/reports/previa-label/sql/sector.sql Outdated
@ -0,0 +1,7 @@
SELECT
`s`.`description`
FROM
guillermo commented 2023-01-12 14:18:14 +00:00
Member
Copy Link

Aun sigue estando mal, sería de la siguiente forma:

SELECT s.description
	FROM vn.saleGroup sg
		JOIN vn.sector s ON s.id = sg.sectorFk
	WHERE sg.id = ?
Aun sigue estando mal, sería de la siguiente forma: ``` SELECT s.description FROM vn.saleGroup sg JOIN vn.sector s ON s.id = sg.sectorFk WHERE sg.id = ? ```
pau marked this conversation as resolved
pau added 1 commit 2023-01-17 09:13:52 +00:00
gitea/salix/pipeline/head This commit looks good Details
f7a25c64b5 format sql
pau requested review from guillermo 2023-01-17 09:14:15 +00:00
pau added 1 commit 2023-01-17 09:35:40 +00:00
gitea/salix/pipeline/head This commit looks good Details
ffad1a6d79 eliminadas las comillas de template
pau added 78 commits 2023-01-17 09:37:23 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
f7a97a8139 fix: siempre muestra el botón si hay datos
gitea/salix/pipeline/head There was a failure building this commit Details
e616835600 delete: hasDateRange()
gitea/salix/pipeline/head This commit looks good Details
a46c2ced7c refs #4975: Added last mdbVersion/last method
gitea/salix/pipeline/head This commit looks good Details
dc82e610b7 refs #4975 Minor changes
gitea/salix/pipeline/head There was a failure building this commit Details
cb9ad5d012 refactor: show ticketId error
gitea/salix/pipeline/head There was a failure building this commit Details
7261415e16 fix: añadido length
gitea/salix/pipeline/head This commit looks good Details
2becc0200c Merge branch 'master' into 4943-master_closeTickets
gitea/salix/pipeline/head This commit looks good Details
27288d011d fix(searchBar): applyParams
gitea/salix/pipeline/head This commit looks good Details
d97a2738a4 refs #4975 Upload method modified and addedd model
gitea/salix/pipeline/head This commit looks good Details
5a25b0ef4c refs #4975 Added model MdbVersionTree
gitea/salix/pipeline/head There was a failure building this commit Details
314bd69d6e Merge branch 'master' into Hotfix-crear-report-Factura-Electronica
gitea/salix/pipeline/head This commit looks good Details
186a64f7fa unfocus
gitea/salix/pipeline/head There was a failure building this commit Details
fce0352986 add fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
c2390c9f9f Merge branch 'master' into Hotfix-crear-report-Factura-Electronica
gitea/salix/pipeline/head This commit looks good Details
c98b5a969d feat: actualizada consulta intrastat
gitea/salix/pipeline/head This commit looks good Details
214aff3569 Merge branch 'master' into 4943-master_closeTickets
gitea/salix/pipeline/head This commit looks good Details
9468f604ff move sql changes
gitea/salix/pipeline/head There was a failure building this commit Details
1c1cc93ef4 Merge branch 'master' into Hotfix-crear-report-Factura-Electronica
gitea/salix/pipeline/head There was a failure building this commit Details
8696d554d6 Change SQL folder
gitea/salix/pipeline/head This commit looks good Details
7aeeddcf18 removed the sql
gitea/salix/pipeline/head This commit looks good Details
ec3e60fddd Merge pull request 'TEST_4825-intrastat' (!1221) from test_4825-intrastat into test 
Reviewed-on: #1221
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
030c474e06 Fixed update module
gitea/salix/pipeline/head There was a failure building this commit Details
46f36e1de1 try
gitea/salix/pipeline/head There was a failure building this commit Details
2803de9445 refs #4975 Return JSON {version:xxx}
gitea/salix/pipeline/head There was a failure building this commit Details
8f81aa2eeb fix: salta los tickets que estan bloqueados
gitea/salix/pipeline/head Build queued... Details
1a74e84359 feat: salta los tickets bloqueados
gitea/salix/pipeline/head There was a failure building this commit Details
0c6d335c4a refactor: machacar stack
gitea/salix/pipeline/head There was a failure building this commit Details
201987fb99 feat: muestra el error
gitea/salix/pipeline/head This commit looks good Details
382aad2622 feat(docuware): upload and send pdf
gitea/salix/pipeline/head There was a failure building this commit Details
f23eb9f4ad refs #4975 Added call to last method in upload
gitea/salix/pipeline/head There was a failure building this commit Details
e0e34595f4 refs #4975 Added translations
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
f103931e50 fix: se concatenan pq sino no muestra el id del ticket
gitea/salix/pipeline/head This commit looks good Details
b8fe919b2a feat(docuware): upload deliveryNote file
gitea/salix/pipeline/head This commit looks good Details
9f324483d6 refactor(docuware): only use axios and refactor all
gitea/salix/pipeline/head There was a failure building this commit Details
d448f41ac1 refs #4975 Changed description of last method
gitea/salix/pipeline/head There was a failure building this commit Details
ed90957ab5 fix: corregida primaryKey de mdbApp
gitea/salix/pipeline/head There was a failure building this commit Details
b6de50848a refs #5081 fix sms faltas
gitea/salix/pipeline/head There was a failure building this commit Details
da8b6b7f2d fix: comprueba que hay registros
gitea/salix/pipeline/head There was a failure building this commit Details
2678d59191 front test expected old value
gitea/salix/pipeline/head There was a failure building this commit Details
d5a7691b9c add controller function
gitea/salix/pipeline/head There was a failure building this commit Details
e05fa7c747 Merge branch 'master' into #5081-hotfix-sms-faltas
gitea/salix/pipeline/head This commit looks good Details
54356ece7d fix(monitor): refresh monitor when using ng-for track 
Refs: #5083
gitea/salix/pipeline/head There was a failure building this commit Details
5bb66fec3f test(docuware): back tests
gitea/salix/pipeline/head There was a failure building this commit Details
c489c4c6a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
def41c011c feat(docuware_upload): send to trash last file
gitea/salix/pipeline/head This commit looks good Details
d413d705dd Merge branch 'dev' into 4839-docuware_send
gitea/salix/pipeline/head There was a failure building this commit Details
7186b76063 Merge branch 'dev' into 4975-mdbVersion-last-method
gitea/salix/pipeline/head This commit looks good Details
73c3f05377 refactor(docuware_upload): simplify json
gitea/salix/pipeline/head This commit looks good Details
5d81cfc121 Merge pull request '4975-mdbVersion-last-method' (!1245) from 4975-mdbVersion-last-method into dev 
Reviewed-on: #1245
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
51b2e5a3bc Merge branch 'dev' into 4732-previa-label
guillermo approved these changes 2023-01-17 10:16:26 +00:00
pau added 1 commit 2023-01-17 10:46:59 +00:00
gitea/salix/pipeline/head This commit looks good Details
f0cc28d698 Merge branch 'dev' into 4732-previa-label
pau added 1 commit 2023-01-18 06:20:29 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
eb4ad206d0 Merge branch 'dev' into 4732-previa-label
pau added 1 commit 2023-01-18 08:15:49 +00:00
gitea/salix/pipeline/head This commit looks good Details
5e198b8541 Merge branch 'dev' into 4732-previa-label
pau merged commit 5507b2de21 into dev 2023-01-18 08:26:11 +00:00
pau deleted branch 4732-previa-label 2023-01-18 08:26:11 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
joan
guillermo
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1163
No description provided.
Delete Branch "4732-previa-label"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?