From d57c19a330a929d7262bc8da22c20a34d56af781 Mon Sep 17 00:00:00 2001 From: robmachado Date: Fri, 2 Dec 2022 09:37:03 -0300 Subject: [PATCH] Ajustes nos jsonschemas --- .../FaketestConsultarEventosEmpregador.php | 2 +- .../s1000_JsonSchemaEvtInfoEmpregador.php | 8 +++---- .../s1010_JsonSchemaEvtTabRubrica.php | 18 +++++++-------- .../s1020_JsonSchemaEvtTabLotacao.php | 11 +++++----- .../s1070_JsonSchemaEvtTabProcesso.php | 6 ++--- .../v_S_01_00_00/s1200_JsonSchemaEvtRemun.php | 10 ++++----- .../s1260_JsonSchemaEvtComProd.php | 5 ++--- .../s2190_JsonSchemaEvtAdmPrelim.php | 2 +- .../s2200_JsonSchemaEvtAdmissao.php | 20 ++++++++--------- .../s2205_JsonSchemaEvtAltCadastral.php | 8 +++---- .../s2206_JsonSchemaEvtAltContratual.php | 16 +++++++------- .../s2230_JsonSchemaEvtAfastTemp.php | 2 +- .../s2245_JsonSchemaEvtTreiCap.php | 6 ++--- .../s2300_JsonSchemaEvtTSVInicio.php | 14 ++++++------ .../s2399_JsonSchemaEvtTSVTermino.php | 14 ++++++------ .../s2416_JsonSchemaEvtCdBenAlt.php | 10 ++++----- jsonSchemes/v_S_01_00_00/evtAdmPrelim.schema | 8 +++---- jsonSchemes/v_S_01_00_00/evtAdmissao.schema | 18 +++++++-------- jsonSchemes/v_S_01_00_00/evtAfastTemp.schema | 2 +- .../v_S_01_00_00/evtAltCadastral.schema | 4 ++-- .../v_S_01_00_00/evtAltContratual.schema | 22 +++++++++---------- jsonSchemes/v_S_01_00_00/evtCdBenAlt.schema | 10 ++++----- jsonSchemes/v_S_01_00_00/evtComProd.schema | 5 ++--- .../v_S_01_00_00/evtContrSindPatr.schema | 2 +- jsonSchemes/v_S_01_00_00/evtDeslig.schema | 2 +- jsonSchemes/v_S_01_00_00/evtExpRisco.schema | 4 ++-- .../v_S_01_00_00/evtInfoComplPer.schema | 6 +++++ .../v_S_01_00_00/evtInfoEmpregador.schema | 6 ++--- jsonSchemes/v_S_01_00_00/evtRemun.schema | 14 +++--------- .../v_S_01_00_00/evtTSVAltContr.schema | 6 ++--- jsonSchemes/v_S_01_00_00/evtTSVInicio.schema | 8 +++---- jsonSchemes/v_S_01_00_00/evtTSVTermino.schema | 12 +++++----- jsonSchemes/v_S_01_00_00/evtTabLotacao.schema | 11 +++++----- .../v_S_01_00_00/evtTabProcesso.schema | 6 ++--- jsonSchemes/v_S_01_00_00/evtTabRubrica.schema | 18 +++++++-------- jsonSchemes/v_S_01_00_00/evtTotConting.schema | 2 +- 36 files changed, 153 insertions(+), 165 deletions(-) diff --git a/examples/Fake/v_S_01_00_00/FaketestConsultarEventosEmpregador.php b/examples/Fake/v_S_01_00_00/FaketestConsultarEventosEmpregador.php index 9da6a52e..d0a1b2f6 100644 --- a/examples/Fake/v_S_01_00_00/FaketestConsultarEventosEmpregador.php +++ b/examples/Fake/v_S_01_00_00/FaketestConsultarEventosEmpregador.php @@ -10,7 +10,7 @@ use NFePHP\eSocial\Tools; $config = [ - 'tpAmb' => 2, + 'tpAmb' => 1, //tipo de ambiente 1 - Produção; 2 - Produção restrita - dados reais;3 - Produção restrita - dados fictícios. 'verProc' => 'S_1.0.0', //Versão do processo de emissão do evento. Informar a versão do aplicativo emissor do evento. diff --git a/examples/schemes/v_S_01_00_00/s1000_JsonSchemaEvtInfoEmpregador.php b/examples/schemes/v_S_01_00_00/s1000_JsonSchemaEvtInfoEmpregador.php index b3b78bd4..e91221c1 100644 --- a/examples/schemes/v_S_01_00_00/s1000_JsonSchemaEvtInfoEmpregador.php +++ b/examples/schemes/v_S_01_00_00/s1000_JsonSchemaEvtInfoEmpregador.php @@ -42,7 +42,7 @@ "type": ["string","null"], "$ref": "#/definitions/periodo" } - } + } }, "infocadastro": { "required": false, @@ -91,7 +91,7 @@ "cnpjefr": { "required": false, "type": ["string","null"], - "pattern": "^[0-9]{14}" + "pattern": "^[0-9]{14}$" } } }, @@ -166,7 +166,7 @@ "required": false, "type": ["string","null"], "$ref": "#/definitions/periodo" - } + } } } } @@ -203,7 +203,7 @@ $std->dadosisencao->ideminlei = 'seila';//Sigla e nome do Ministério ou Lei que concedeu o Certificado $std->dadosisencao->nrcertif = '987654321';//Número do Certificado de Entidade Beneficente de Assistência Social, número da portaria de concessão do Certificado, ou, no caso de concessão através de Lei específica, o número da Lei. $std->dadosisencao->dtemiscertif = '2016-11-04';//Data de Emissão do Certificado/publicação da Lei -$std->dadosisencao->dtvenccertif = '2018-11-03';//Data de Vencimento do Certificado +$std->dadosisencao->dtvenccertif = '2018-11-03';//Data de Vencimento do Certificado $std->dadosisencao->nrprotrenov = null;//Protocolo pedido renovação $std->dadosisencao->dtprotrenov = null;//Data do protocolo de renovação $std->dadosisencao->dtdou = null;//Preencher com a data de publicação no Diário Oficial da União diff --git a/examples/schemes/v_S_01_00_00/s1010_JsonSchemaEvtTabRubrica.php b/examples/schemes/v_S_01_00_00/s1010_JsonSchemaEvtTabRubrica.php index 61756803..f1f5b585 100644 --- a/examples/schemes/v_S_01_00_00/s1010_JsonSchemaEvtTabRubrica.php +++ b/examples/schemes/v_S_01_00_00/s1010_JsonSchemaEvtTabRubrica.php @@ -28,14 +28,12 @@ "codrubr": { "required": true, "type": "string", - "maxLength": 30, - "pattern": "^(?!eSocial)" + "maxLength": 30 }, "idetabrubr": { "required": true, "type": "string", - "maxLength": 8, - "pattern": "^(?!eSocial)" + "maxLength": 8 }, "inivalid": { "required": true, @@ -131,10 +129,10 @@ "codsusp": { "required": true, "type": "string", - "pattern": "^[0-9]{1,14}" + "pattern": "^[0-9]{1,14}$" } } - } + } }, "ideprocessoirrf": { "required": false, @@ -152,10 +150,10 @@ "codsusp": { "required": true, "type": "string", - "pattern": "^[0-9]{1,14}" + "pattern": "^[0-9]{1,14}$" } } - } + } }, "ideprocessofgts": { "required": false, @@ -171,7 +169,7 @@ "$ref": "#/definitions/string20" } } - } + } } } }, @@ -189,7 +187,7 @@ "type": ["string","null"], "$ref": "#/definitions/periodo" } - } + } } } }'; diff --git a/examples/schemes/v_S_01_00_00/s1020_JsonSchemaEvtTabLotacao.php b/examples/schemes/v_S_01_00_00/s1020_JsonSchemaEvtTabLotacao.php index b6ebb7b6..e4ea4d44 100644 --- a/examples/schemes/v_S_01_00_00/s1020_JsonSchemaEvtTabLotacao.php +++ b/examples/schemes/v_S_01_00_00/s1020_JsonSchemaEvtTabLotacao.php @@ -27,8 +27,7 @@ "codlotacao": { "required": true, "type": "string", - "maxLength": 30, - "pattern": "^(?!eSocial)" + "maxLength": 30 }, "inivalid": { "required": true, @@ -101,7 +100,7 @@ "codsusp": { "required": true, "type": "string", - "pattern": "^[0-9]{1,14}" + "pattern": "^[0-9]{1,14}$" } } } @@ -119,7 +118,7 @@ "nrinsccontrat": { "required": true, "type": "string", - "pattern": "^[0-9]{11,14}" + "pattern": "^[0-9]{11,14}$" }, "tpinscprop": { "required": false, @@ -130,7 +129,7 @@ "nrinscprop": { "required": false, "type": ["string","null"], - "pattern": "^[0-9]{11,14}" + "pattern": "^[0-9]{11,14}$" } } }, @@ -168,7 +167,7 @@ "type": ["string","null"], "$ref": "#/definitions/periodo" } - } + } } } }'; diff --git a/examples/schemes/v_S_01_00_00/s1070_JsonSchemaEvtTabProcesso.php b/examples/schemes/v_S_01_00_00/s1070_JsonSchemaEvtTabProcesso.php index 6c2a955f..44db17ca 100644 --- a/examples/schemes/v_S_01_00_00/s1070_JsonSchemaEvtTabProcesso.php +++ b/examples/schemes/v_S_01_00_00/s1070_JsonSchemaEvtTabProcesso.php @@ -84,7 +84,7 @@ "ufvara": { "required": true, "type": "string", - "pattern": "^(AC|AL|AP|AM|BA|CE|DF|ES|GO|MA|MT|MS|MG|PA|PB|PR|PE|PI|RJ|RN|RS|RO|RR|SC|SP|SE|TO)$" + "$ref": "#/definitions/siglauf" }, "codmunic": { "required": true, @@ -128,7 +128,7 @@ } } } - } + } } }, "novavalidade": { @@ -145,7 +145,7 @@ "type": ["string","null"], "$ref": "#/definitions/periodo" } - } + } } } }'; diff --git a/examples/schemes/v_S_01_00_00/s1200_JsonSchemaEvtRemun.php b/examples/schemes/v_S_01_00_00/s1200_JsonSchemaEvtRemun.php index f7f7db67..8a7c47d7 100644 --- a/examples/schemes/v_S_01_00_00/s1200_JsonSchemaEvtRemun.php +++ b/examples/schemes/v_S_01_00_00/s1200_JsonSchemaEvtRemun.php @@ -610,7 +610,7 @@ "tpacconv": { "required": true, "type": "string", - "pattern": "A|B|C|D|E|F" + "pattern": "^(A|B|C|D|E|F|G|H)$" }, "compacconv": { "required": false, @@ -631,7 +631,7 @@ "required": true, "type": "string", "maxLength": 1, - "pattern": "S|N" + "pattern": "^(S|N)$" }, "ideperiodo": { "required": true, @@ -772,9 +772,7 @@ "codcbo": { "required": true, "type": "string", - "minLength": 4, - "maxLength": 6, - "pattern": "^[0-9]" + "pattern": "^[0-9]{4,6}$" }, "natatividade": { "required": false, @@ -901,7 +899,7 @@ $std->dmdev[0]->ideadc[0]->ideperiodo[0]->ideestablot[0]->nrinsc = '12345678901234'; //Obrigatório $std->dmdev[0]->ideadc[0]->ideperiodo[0]->ideestablot[0]->codlotacao = 'ksjskjkjskjjs'; //Obrigatório -//Informações relativas à remuneração do trabalhador em períodos anteriores. +//Informações relativas à remuneração do trabalhador em períodos anteriores. $std->dmdev[0]->ideadc[0]->ideperiodo[0]->ideestablot[0]->remunperant[0] = new \stdClass(); //Obrigatório $std->dmdev[0]->ideadc[0]->ideperiodo[0]->ideestablot[0]->remunperant[0]->matricula = 'kjskjskjskjs'; //Opcional $std->dmdev[0]->ideadc[0]->ideperiodo[0]->ideestablot[0]->remunperant[0]->indsimples = 1; //Opcional diff --git a/examples/schemes/v_S_01_00_00/s1260_JsonSchemaEvtComProd.php b/examples/schemes/v_S_01_00_00/s1260_JsonSchemaEvtComProd.php index ee8b5def..0b21b83b 100644 --- a/examples/schemes/v_S_01_00_00/s1260_JsonSchemaEvtComProd.php +++ b/examples/schemes/v_S_01_00_00/s1260_JsonSchemaEvtComProd.php @@ -155,8 +155,7 @@ "codsusp": { "required": true, "type": "string", - "maxLength": 14, - "pattern": "^[0-9]" + "pattern": "^[0-9]{1,14}$" }, "vrcpsusp": { "required": false, @@ -174,7 +173,7 @@ } } } - } + } } } } diff --git a/examples/schemes/v_S_01_00_00/s2190_JsonSchemaEvtAdmPrelim.php b/examples/schemes/v_S_01_00_00/s2190_JsonSchemaEvtAdmPrelim.php index c8faf99b..a6bb11a3 100644 --- a/examples/schemes/v_S_01_00_00/s2190_JsonSchemaEvtAdmPrelim.php +++ b/examples/schemes/v_S_01_00_00/s2190_JsonSchemaEvtAdmPrelim.php @@ -59,7 +59,7 @@ "codcateg": { "required": true, "type": "string", - "pattern": "^[0-9]{3}" + "pattern": "^[0-9]{3}$" }, "natatividade": { "required": false, diff --git a/examples/schemes/v_S_01_00_00/s2200_JsonSchemaEvtAdmissao.php b/examples/schemes/v_S_01_00_00/s2200_JsonSchemaEvtAdmissao.php index e668e95f..09823332 100644 --- a/examples/schemes/v_S_01_00_00/s2200_JsonSchemaEvtAdmissao.php +++ b/examples/schemes/v_S_01_00_00/s2200_JsonSchemaEvtAdmissao.php @@ -37,7 +37,7 @@ "cpftrab": { "required": true, "type": "string", - "pattern": "^[0-9]{11}" + "pattern": "^[0-9]{11}$" }, "nmtrab": { "required": true, @@ -470,7 +470,7 @@ } } } - } + } }, "infoestatutario": { "required": false, @@ -508,7 +508,7 @@ "type": ["string", "null"], "$ref": "#/definitions/data" } - } + } }, "infocontrato": { "required": true, @@ -570,7 +570,7 @@ "maxLength": 255 } } - }, + }, "duracao": { "required": false, "type": ["object","null"], @@ -726,7 +726,7 @@ "minLength": 1, "maxLength": 255 } - } + } } }, "treicap": { @@ -743,10 +743,10 @@ "minimum": 1, "maximum": 9999 } - } + } } } - } + } }, "sucessaovinc": { "required": false, @@ -868,8 +868,8 @@ } } } - } - } + } + } } }'; @@ -957,7 +957,7 @@ $std->vinculo->infoceletista->trabtemporario->hipleg = 1; $std->vinculo->infoceletista->trabtemporario->justcontr = 'jwkjwkjwkjwk'; -$std->vinculo->infoceletista->trabtemporario->ideestabvinc = new \stdClass(); +$std->vinculo->infoceletista->trabtemporario->ideestabvinc = new \stdClass(); $std->vinculo->infoceletista->trabtemporario->ideestabvinc->tpinsc = 2; //1 pu 2 $std->vinculo->infoceletista->trabtemporario->ideestabvinc->nrinsc = '12345678901234'; diff --git a/examples/schemes/v_S_01_00_00/s2205_JsonSchemaEvtAltCadastral.php b/examples/schemes/v_S_01_00_00/s2205_JsonSchemaEvtAltCadastral.php index f82c4751..69e90f34 100644 --- a/examples/schemes/v_S_01_00_00/s2205_JsonSchemaEvtAltCadastral.php +++ b/examples/schemes/v_S_01_00_00/s2205_JsonSchemaEvtAltCadastral.php @@ -129,7 +129,7 @@ "codmunic": { "required": true, "type": "string", - "pattern": "^[0-9]{7}" + "pattern": "^[0-9]{7}$" }, "uf": { "required": true, @@ -145,7 +145,7 @@ "paisresid": { "required": true, "type": "string", - "pattern": "^[0-9]{3}" + "pattern": "^[0-9]{3}$" }, "dsclograd": { "required": true, @@ -368,7 +368,7 @@ $std->infodeficiencia->defmental = 'N'; //Obrigatório $std->infodeficiencia->defintelectual = 'N'; //Obrigatório $std->infodeficiencia->reabreadap = 'N'; //Obrigatório -$std->infodeficiencia->infocota = 'N'; //Opcional +$std->infodeficiencia->infocota = 'N'; //Opcional $std->infodeficiencia->observacao = 'lkslkslkslkslkslks'; //Opcional //Informações dos dependentes. @@ -383,7 +383,7 @@ //Informações de contato. $std->contato = new \stdClass(); //Opcional -$std->contato->foneprinc = '1234567890'; //Opcional +$std->contato->foneprinc = '1234567890'; //Opcional $std->contato->emailprinc = 'ele@mail.com'; //Opcional // Schema must be decoded before it can be used for validation diff --git a/examples/schemes/v_S_01_00_00/s2206_JsonSchemaEvtAltContratual.php b/examples/schemes/v_S_01_00_00/s2206_JsonSchemaEvtAltContratual.php index 77d79e9b..b55d6e54 100644 --- a/examples/schemes/v_S_01_00_00/s2206_JsonSchemaEvtAltContratual.php +++ b/examples/schemes/v_S_01_00_00/s2206_JsonSchemaEvtAltContratual.php @@ -92,7 +92,7 @@ "cnpjsindcategprof": { "required": true, "type": "string", - "pattern": "^[0-9]{8,14}$" + "pattern": "^[0-9]{8,14}$" }, "trabtemporario": { "required": false, @@ -138,12 +138,12 @@ "indtetorgps": { "required": true, "type": "string", - "pattern": "S|N" + "pattern": "^(S|N)$" }, "indabonoperm": { "required": true, "type": "string", - "pattern": "S|N" + "pattern": "^(S|N)$" } } }, @@ -174,7 +174,7 @@ "acumcargo": { "required": false, "type": ["string","null"], - "pattern": "S|N" + "pattern": "^(S|N)$" }, "codcateg": { "required": true, @@ -306,7 +306,7 @@ "hornoturno": { "required": false, "type": ["string", "null"], - "pattern": "S|N" + "pattern": "^(S|N)$" }, "dscjorn": { "required": true, @@ -339,7 +339,7 @@ "type": "string", "maxLength": 255 } - } + } } }, "treicap": { @@ -356,10 +356,10 @@ "minimum": 1, "maximum": 9999 } - } + } } } - } + } } } }'; diff --git a/examples/schemes/v_S_01_00_00/s2230_JsonSchemaEvtAfastTemp.php b/examples/schemes/v_S_01_00_00/s2230_JsonSchemaEvtAfastTemp.php index b2a90eb4..d3768c47 100644 --- a/examples/schemes/v_S_01_00_00/s2230_JsonSchemaEvtAfastTemp.php +++ b/examples/schemes/v_S_01_00_00/s2230_JsonSchemaEvtAfastTemp.php @@ -148,7 +148,7 @@ "indremuncargo": { "required": false, "type": ["string","null"], - "pattern": "S|N" + "pattern": "^(S|N)$" } } } diff --git a/examples/schemes/v_S_01_00_00/s2245_JsonSchemaEvtTreiCap.php b/examples/schemes/v_S_01_00_00/s2245_JsonSchemaEvtTreiCap.php index 9a5b0894..7dc24acc 100644 --- a/examples/schemes/v_S_01_00_00/s2245_JsonSchemaEvtTreiCap.php +++ b/examples/schemes/v_S_01_00_00/s2245_JsonSchemaEvtTreiCap.php @@ -103,7 +103,7 @@ "indtreinant": { "required": true, "type": "string", - "pattern": "^S|N$" + "pattern": "^(S|N)$" }, "ideprofresp": { "required": true, @@ -146,7 +146,7 @@ "maximum": 2 } } - } + } } } } @@ -181,7 +181,7 @@ $std->treicap->infocomplem->ideprofresp[0]->nmprof = 'Beltrano de Tal'; $std->treicap->infocomplem->ideprofresp[0]->tpprof = 1; //1-2 $std->treicap->infocomplem->ideprofresp[0]->formprof = 'bla bla bla'; -$std->treicap->infocomplem->ideprofresp[0]->codcbo = '123456'; +$std->treicap->infocomplem->ideprofresp[0]->codcbo = '123456'; $std->treicap->infocomplem->ideprofresp[0]->nacprof = 1; //1-2 diff --git a/examples/schemes/v_S_01_00_00/s2300_JsonSchemaEvtTSVInicio.php b/examples/schemes/v_S_01_00_00/s2300_JsonSchemaEvtTSVInicio.php index d62d1a59..61cc96cf 100644 --- a/examples/schemes/v_S_01_00_00/s2300_JsonSchemaEvtTSVInicio.php +++ b/examples/schemes/v_S_01_00_00/s2300_JsonSchemaEvtTSVInicio.php @@ -1,6 +1,6 @@ contato = new \stdClass(); //Opcional -$std->contato->foneprinc = '1234567890'; //Opcional +$std->contato->foneprinc = '1234567890'; //Opcional $std->contato->emailprinc = 'ele@mail.com'; //Opcional //Trabalhador Sem Vínculo de Emprego/Estatutário - TSVE - Início. @@ -739,7 +739,7 @@ //Grupo que apresenta o cargo e/ou função ocupada pelo TSVE. $std->cargofuncao = new \stdClass(); //Opcional $std->cargofuncao->nmcargo = 'lalalaloaoaoa'; //Opcional -$std->cargofuncao->cbocargo = '263105'; //Opcional +$std->cargofuncao->cbocargo = '263105'; //Opcional $std->cargofuncao->nmfuncao = 'ksksksksk sk'; //Opcional $std->cargofuncao->cbofuncao = '263105'; //Opcional diff --git a/examples/schemes/v_S_01_00_00/s2399_JsonSchemaEvtTSVTermino.php b/examples/schemes/v_S_01_00_00/s2399_JsonSchemaEvtTSVTermino.php index 21431060..b05a76b7 100644 --- a/examples/schemes/v_S_01_00_00/s2399_JsonSchemaEvtTSVTermino.php +++ b/examples/schemes/v_S_01_00_00/s2399_JsonSchemaEvtTSVTermino.php @@ -67,7 +67,7 @@ "mtvdesligtsv": { "required": false, "type": ["string","null"], - "pattern": "^[0-9]{2}" + "pattern": "^[0-9]{2}$" }, "pensalim": { "required": false, @@ -86,12 +86,12 @@ "nrproctrab": { "required": false, "type": ["string","null"], - "pattern": "^.{20}" + "pattern": "^.{20}$" }, "novocpf": { "required": false, "type": ["string","null"], - "pattern": "^[0-9]{11}" + "pattern": "^[0-9]{11}$" }, "verbasresc": { "required": false, @@ -175,7 +175,7 @@ "maximum": 1 } } - } + } }, "infosimples": { "required": false, @@ -220,7 +220,7 @@ "pattern": "^[0-9]{1,14}$" } } - } + } }, "infomv": { "required": false, @@ -262,7 +262,7 @@ "type": "number" } } - } + } } } } @@ -298,7 +298,7 @@ $std->vralim = 600.23; $std->nrproctrab = "12345678901234567890"; $std->novocpf = "12345678901"; - + $std->verbasresc = new \stdClass(); $std->verbasresc->dmdev[1] = new \stdClass(); $std->verbasresc->dmdev[1]->idedmdev = 'ksksksksksksksk'; diff --git a/examples/schemes/v_S_01_00_00/s2416_JsonSchemaEvtCdBenAlt.php b/examples/schemes/v_S_01_00_00/s2416_JsonSchemaEvtCdBenAlt.php index fffd2e08..55895da1 100644 --- a/examples/schemes/v_S_01_00_00/s2416_JsonSchemaEvtCdBenAlt.php +++ b/examples/schemes/v_S_01_00_00/s2416_JsonSchemaEvtCdBenAlt.php @@ -59,7 +59,7 @@ "required": true, "type": "integer", "minimum": 0, - "maximum": 3 + "maximum": 3 }, "dsc": { "required": false, @@ -69,7 +69,7 @@ "indsuspensao": { "required": true, "type": "string", - "pattern": "^S|N$" + "pattern": "^(S|N)$" }, "infopenmorte": { "required": false, @@ -79,7 +79,7 @@ "required": true, "type": "integer", "minimum": 1, - "maximum": 2 + "maximum": 2 } } }, @@ -90,7 +90,7 @@ "mtvsuspensao": { "required": true, "type": "string", - "pattern": "^01|99$" + "pattern": "^(01|99)$" }, "dscSuspensao": { "required": false, @@ -99,7 +99,7 @@ } } } - + } }'; diff --git a/jsonSchemes/v_S_01_00_00/evtAdmPrelim.schema b/jsonSchemes/v_S_01_00_00/evtAdmPrelim.schema index d64ecf31..59edd7cb 100755 --- a/jsonSchemes/v_S_01_00_00/evtAdmPrelim.schema +++ b/jsonSchemes/v_S_01_00_00/evtAdmPrelim.schema @@ -3,8 +3,8 @@ "type": "object", "properties": { "sequencial": { - "required": true, - "type": "integer", + "required": false, + "type": ["integer","null"], "minimum": 1, "maximum": 99999 }, @@ -17,7 +17,7 @@ "nrrecibo": { "required": false, "type": ["string","null"], - "pattern": "^[1]{1}.[0-9]{1}.[0-9]{19}$" + "$ref": "#/definitions/recibo" }, "cpftrab": { "required": true, @@ -43,7 +43,7 @@ "codcateg": { "required": true, "type": "string", - "pattern": "^[0-9]{3}" + "pattern": "^[0-9]{3}$" }, "natatividade": { "required": false, diff --git a/jsonSchemes/v_S_01_00_00/evtAdmissao.schema b/jsonSchemes/v_S_01_00_00/evtAdmissao.schema index f809fedc..9c2a7b29 100755 --- a/jsonSchemes/v_S_01_00_00/evtAdmissao.schema +++ b/jsonSchemes/v_S_01_00_00/evtAdmissao.schema @@ -22,7 +22,7 @@ "cpftrab": { "required": true, "type": "string", - "pattern": "^[0-9]{11}" + "pattern": "^[0-9]{11}$" }, "nmtrab": { "required": true, @@ -455,7 +455,7 @@ } } } - } + } }, "infoestatutario": { "required": false, @@ -493,7 +493,7 @@ "type": ["string", "null"], "$ref": "#/definitions/data" } - } + } }, "infocontrato": { "required": true, @@ -555,7 +555,7 @@ "maxLength": 255 } } - }, + }, "duracao": { "required": false, "type": ["object","null"], @@ -711,7 +711,7 @@ "minLength": 1, "maxLength": 255 } - } + } } }, "treicap": { @@ -728,10 +728,10 @@ "minimum": 1, "maximum": 9999 } - } + } } } - } + } }, "sucessaovinc": { "required": false, @@ -853,7 +853,7 @@ } } } - } - } + } + } } } \ No newline at end of file diff --git a/jsonSchemes/v_S_01_00_00/evtAfastTemp.schema b/jsonSchemes/v_S_01_00_00/evtAfastTemp.schema index 305d2206..7495cb44 100755 --- a/jsonSchemes/v_S_01_00_00/evtAfastTemp.schema +++ b/jsonSchemes/v_S_01_00_00/evtAfastTemp.schema @@ -132,7 +132,7 @@ "indremuncargo": { "required": false, "type": ["string","null"], - "pattern": "S|N" + "pattern": "^(S|N)$" } } } diff --git a/jsonSchemes/v_S_01_00_00/evtAltCadastral.schema b/jsonSchemes/v_S_01_00_00/evtAltCadastral.schema index ba76f56d..824a48ff 100755 --- a/jsonSchemes/v_S_01_00_00/evtAltCadastral.schema +++ b/jsonSchemes/v_S_01_00_00/evtAltCadastral.schema @@ -109,7 +109,7 @@ "codmunic": { "required": true, "type": "string", - "pattern": "^[0-9]{7}" + "pattern": "^[0-9]{7}$" }, "uf": { "required": true, @@ -125,7 +125,7 @@ "paisresid": { "required": true, "type": "string", - "pattern": "^[0-9]{3}" + "pattern": "^[0-9]{3}$" }, "dsclograd": { "required": true, diff --git a/jsonSchemes/v_S_01_00_00/evtAltContratual.schema b/jsonSchemes/v_S_01_00_00/evtAltContratual.schema index b5b03c14..089fddad 100755 --- a/jsonSchemes/v_S_01_00_00/evtAltContratual.schema +++ b/jsonSchemes/v_S_01_00_00/evtAltContratual.schema @@ -77,7 +77,7 @@ "cnpjsindcategprof": { "required": true, "type": "string", - "pattern": "^[0-9]{8,14}$" + "pattern": "^[0-9]{8,14}$" }, "trabtemporario": { "required": false, @@ -117,18 +117,18 @@ "tpplanrp": { "required": true, "type": "integer", - "minimum": 0, - "maximum": 3 + "minimum": 1, + "maximum": 2 }, "indtetorgps": { "required": true, "type": "string", - "pattern": "S|N" + "pattern": "^(S|N)$" }, "indabonoperm": { "required": true, "type": "string", - "pattern": "S|N" + "pattern": "^(S|N)$" } } }, @@ -159,7 +159,7 @@ "acumcargo": { "required": false, "type": ["string","null"], - "pattern": "S|N" + "pattern": "^(S|N)$" }, "codcateg": { "required": true, @@ -291,7 +291,7 @@ "hornoturno": { "required": false, "type": ["string", "null"], - "pattern": "S|N" + "pattern": "^(S|N)$" }, "dscjorn": { "required": true, @@ -324,7 +324,7 @@ "type": "string", "maxLength": 255 } - } + } } }, "treicap": { @@ -341,10 +341,10 @@ "minimum": 1, "maximum": 9999 } - } + } } } - } + } } } -} +} \ No newline at end of file diff --git a/jsonSchemes/v_S_01_00_00/evtCdBenAlt.schema b/jsonSchemes/v_S_01_00_00/evtCdBenAlt.schema index ff3378b3..c230905f 100755 --- a/jsonSchemes/v_S_01_00_00/evtCdBenAlt.schema +++ b/jsonSchemes/v_S_01_00_00/evtCdBenAlt.schema @@ -43,7 +43,7 @@ "required": true, "type": "integer", "minimum": 0, - "maximum": 3 + "maximum": 3 }, "dsc": { "required": false, @@ -53,7 +53,7 @@ "indsuspensao": { "required": true, "type": "string", - "pattern": "^S|N$" + "pattern": "^(S|N)$" }, "infopenmorte": { "required": false, @@ -63,7 +63,7 @@ "required": true, "type": "integer", "minimum": 1, - "maximum": 2 + "maximum": 2 } } }, @@ -74,7 +74,7 @@ "mtvsuspensao": { "required": true, "type": "string", - "pattern": "^01|99$" + "pattern": "^(01|99)$" }, "dscSuspensao": { "required": false, @@ -83,6 +83,6 @@ } } } - + } } \ No newline at end of file diff --git a/jsonSchemes/v_S_01_00_00/evtComProd.schema b/jsonSchemes/v_S_01_00_00/evtComProd.schema index 47255f7d..d5f4ef78 100755 --- a/jsonSchemes/v_S_01_00_00/evtComProd.schema +++ b/jsonSchemes/v_S_01_00_00/evtComProd.schema @@ -135,8 +135,7 @@ "codsusp": { "required": true, "type": "string", - "maxLength": 14, - "pattern": "^[0-9]" + "pattern": "^[0-9]{1,14}$" }, "vrcpsusp": { "required": false, @@ -154,7 +153,7 @@ } } } - } + } } } } diff --git a/jsonSchemes/v_S_01_00_00/evtContrSindPatr.schema b/jsonSchemes/v_S_01_00_00/evtContrSindPatr.schema index 3097f840..4f1361db 100755 --- a/jsonSchemes/v_S_01_00_00/evtContrSindPatr.schema +++ b/jsonSchemes/v_S_01_00_00/evtContrSindPatr.schema @@ -28,7 +28,7 @@ "perapur": { "required": true, "type": "string", - "pattern": "^(19[0-9][0-9]|2[0-9][0-9][0-9])([-](0?[1-9]|1[0-2]))?$" + "$ref": "#/definitions/periodo" }, "contribsind": { "required": true, diff --git a/jsonSchemes/v_S_01_00_00/evtDeslig.schema b/jsonSchemes/v_S_01_00_00/evtDeslig.schema index e05f306e..4a5158d7 100755 --- a/jsonSchemes/v_S_01_00_00/evtDeslig.schema +++ b/jsonSchemes/v_S_01_00_00/evtDeslig.schema @@ -125,7 +125,7 @@ "nrinsc": { "required": true, "type": "string", - "pattern": "^[0-9]{14}$" + "pattern": "^[0-9]{11}|[0-9]{14}$" } } }, diff --git a/jsonSchemes/v_S_01_00_00/evtExpRisco.schema b/jsonSchemes/v_S_01_00_00/evtExpRisco.schema index c962a18f..bb9b7cfc 100755 --- a/jsonSchemes/v_S_01_00_00/evtExpRisco.schema +++ b/jsonSchemes/v_S_01_00_00/evtExpRisco.schema @@ -117,7 +117,7 @@ "maxLength": 40 }, "epcepi": { - "required": false, + "required": true, "type": "object", "properties": { "utilizepc": { @@ -215,7 +215,7 @@ "type": "object", "properties": { "cpfresp": { - "required": false, + "required": true, "type": "string", "pattern": "^[0-9]{11}$" }, diff --git a/jsonSchemes/v_S_01_00_00/evtInfoComplPer.schema b/jsonSchemes/v_S_01_00_00/evtInfoComplPer.schema index 1a3c2312..a550e413 100755 --- a/jsonSchemes/v_S_01_00_00/evtInfoComplPer.schema +++ b/jsonSchemes/v_S_01_00_00/evtInfoComplPer.schema @@ -19,6 +19,12 @@ "type": ["string","null"], "$ref": "#/definitions/recibo" }, + "indapuracao": { + "required": true, + "type": "integer", + "minimum": 1, + "maximum": 2 + }, "perapur": { "required": true, "type": "string", diff --git a/jsonSchemes/v_S_01_00_00/evtInfoEmpregador.schema b/jsonSchemes/v_S_01_00_00/evtInfoEmpregador.schema index d6fc2b2f..6620cc1f 100755 --- a/jsonSchemes/v_S_01_00_00/evtInfoEmpregador.schema +++ b/jsonSchemes/v_S_01_00_00/evtInfoEmpregador.schema @@ -27,7 +27,7 @@ "type": ["string","null"], "$ref": "#/definitions/periodo" } - } + } }, "infocadastro": { "required": false, @@ -76,7 +76,7 @@ "cnpjefr": { "required": false, "type": ["string","null"], - "pattern": "^[0-9]{14}" + "pattern": "^[0-9]{14}$" } } }, @@ -151,7 +151,7 @@ "required": false, "type": ["string","null"], "$ref": "#/definitions/periodo" - } + } } } } diff --git a/jsonSchemes/v_S_01_00_00/evtRemun.schema b/jsonSchemes/v_S_01_00_00/evtRemun.schema index 24df9133..98e60c18 100755 --- a/jsonSchemes/v_S_01_00_00/evtRemun.schema +++ b/jsonSchemes/v_S_01_00_00/evtRemun.schema @@ -465,12 +465,6 @@ "vrrubr": { "required": false, "type": ["number","null"] - }, - "indapurir": { - "required": false, - "type": ["integer","null"], - "minumum": 0, - "maximum": 3 } } } @@ -589,7 +583,7 @@ "tpacconv": { "required": true, "type": "string", - "pattern": "A|B|C|D|E|F" + "pattern": "^(A|B|C|D|E|F|G|H)$" }, "compacconv": { "required": false, @@ -610,7 +604,7 @@ "required": true, "type": "string", "maxLength": 1, - "pattern": "S|N" + "pattern": "^(S|N)$" }, "ideperiodo": { "required": true, @@ -751,9 +745,7 @@ "codcbo": { "required": true, "type": "string", - "minLength": 4, - "maxLength": 6, - "pattern": "^[0-9]" + "pattern": "^[0-9]{4,6}$" }, "natatividade": { "required": false, diff --git a/jsonSchemes/v_S_01_00_00/evtTSVAltContr.schema b/jsonSchemes/v_S_01_00_00/evtTSVAltContr.schema index fdf722a9..68a9dc44 100755 --- a/jsonSchemes/v_S_01_00_00/evtTSVAltContr.schema +++ b/jsonSchemes/v_S_01_00_00/evtTSVAltContr.schema @@ -181,12 +181,12 @@ "type": "object", "properties": { "cnpjinstensino": { - "required": false, + "required": true, "type": "string", "pattern": "^[0-9]{14}$" }, "nmrazao": { - "required": false, + "required": true, "type": "string", "maxLength": 100 }, @@ -247,4 +247,4 @@ } } } -} +} \ No newline at end of file diff --git a/jsonSchemes/v_S_01_00_00/evtTSVInicio.schema b/jsonSchemes/v_S_01_00_00/evtTSVInicio.schema index 706ce794..1f656db4 100755 --- a/jsonSchemes/v_S_01_00_00/evtTSVInicio.schema +++ b/jsonSchemes/v_S_01_00_00/evtTSVInicio.schema @@ -130,7 +130,7 @@ "paisresid": { "required": true, "type": "string", - "pattern": "^[0-9]{3}" + "pattern": "^[0-9]{3}$" }, "dsclograd": { "required": true, @@ -402,7 +402,7 @@ "nrinsc": { "required": false, "type": ["string","null"], - "pattern": "^[0-9]{11,14}" + "pattern": "^[0-9]{11,14}$" }, "dtadmorig": { "required": false, @@ -564,7 +564,7 @@ "codmunic": { "required": false, "type": ["string","null"], - "pattern": "^[0-9]{7}" + "pattern": "^[0-9]{7}$" }, "uf": { "required": false, @@ -625,7 +625,7 @@ "codmotafast": { "required": true, "type": "string", - "pattern": "^[0-9]{2}" + "pattern": "^[0-9]{2}$" } } }, diff --git a/jsonSchemes/v_S_01_00_00/evtTSVTermino.schema b/jsonSchemes/v_S_01_00_00/evtTSVTermino.schema index cfc8d32b..8e806b74 100755 --- a/jsonSchemes/v_S_01_00_00/evtTSVTermino.schema +++ b/jsonSchemes/v_S_01_00_00/evtTSVTermino.schema @@ -49,7 +49,7 @@ "mtvdesligtsv": { "required": false, "type": ["string","null"], - "pattern": "^[0-9]{2}" + "pattern": "^[0-9]{2}$" }, "pensalim": { "required": false, @@ -68,12 +68,12 @@ "nrproctrab": { "required": false, "type": ["string","null"], - "pattern": "^.{20}" + "pattern": "^.{20}$" }, "novocpf": { "required": false, "type": ["string","null"], - "pattern": "^[0-9]{11}" + "pattern": "^[0-9]{11}$" }, "verbasresc": { "required": false, @@ -157,7 +157,7 @@ "maximum": 1 } } - } + } }, "infosimples": { "required": false, @@ -202,7 +202,7 @@ "pattern": "^[0-9]{1,14}$" } } - } + } }, "infomv": { "required": false, @@ -244,7 +244,7 @@ "type": "number" } } - } + } } } } diff --git a/jsonSchemes/v_S_01_00_00/evtTabLotacao.schema b/jsonSchemes/v_S_01_00_00/evtTabLotacao.schema index fc3421a6..2a3bd6ce 100755 --- a/jsonSchemes/v_S_01_00_00/evtTabLotacao.schema +++ b/jsonSchemes/v_S_01_00_00/evtTabLotacao.schema @@ -11,8 +11,7 @@ "codlotacao": { "required": true, "type": "string", - "maxLength": 30, - "pattern": "^(?!eSocial)" + "maxLength": 30 }, "inivalid": { "required": true, @@ -85,7 +84,7 @@ "codsusp": { "required": true, "type": "string", - "pattern": "^[0-9]{1,14}" + "pattern": "^[0-9]{1,14}$" } } } @@ -103,7 +102,7 @@ "nrinsccontrat": { "required": true, "type": "string", - "pattern": "^[0-9]{11,14}" + "pattern": "^[0-9]{11,14}$" }, "tpinscprop": { "required": false, @@ -114,7 +113,7 @@ "nrinscprop": { "required": false, "type": ["string","null"], - "pattern": "^[0-9]{11,14}" + "pattern": "^[0-9]{11,14}$" } } }, @@ -152,7 +151,7 @@ "type": ["string","null"], "$ref": "#/definitions/periodo" } - } + } } } } \ No newline at end of file diff --git a/jsonSchemes/v_S_01_00_00/evtTabProcesso.schema b/jsonSchemes/v_S_01_00_00/evtTabProcesso.schema index 67a9fba5..b6071330 100755 --- a/jsonSchemes/v_S_01_00_00/evtTabProcesso.schema +++ b/jsonSchemes/v_S_01_00_00/evtTabProcesso.schema @@ -62,7 +62,7 @@ "ufvara": { "required": true, "type": "string", - "pattern": "^(AC|AL|AP|AM|BA|CE|DF|ES|GO|MA|MT|MS|MG|PA|PB|PR|PE|PI|RJ|RN|RS|RO|RR|SC|SP|SE|TO)$" + "$ref": "#/definitions/siglauf" }, "codmunic": { "required": true, @@ -106,7 +106,7 @@ } } } - } + } } }, "novavalidade": { @@ -123,7 +123,7 @@ "type": ["string","null"], "$ref": "#/definitions/periodo" } - } + } } } } \ No newline at end of file diff --git a/jsonSchemes/v_S_01_00_00/evtTabRubrica.schema b/jsonSchemes/v_S_01_00_00/evtTabRubrica.schema index f262cea3..6e1e95d1 100755 --- a/jsonSchemes/v_S_01_00_00/evtTabRubrica.schema +++ b/jsonSchemes/v_S_01_00_00/evtTabRubrica.schema @@ -11,14 +11,12 @@ "codrubr": { "required": true, "type": "string", - "maxLength": 30, - "pattern": "^(?!eSocial)" + "maxLength": 30 }, "idetabrubr": { "required": true, "type": "string", - "maxLength": 8, - "pattern": "^(?!eSocial)" + "maxLength": 8 }, "inivalid": { "required": true, @@ -114,10 +112,10 @@ "codsusp": { "required": true, "type": "string", - "pattern": "^[0-9]{1,14}" + "pattern": "^[0-9]{1,14}$" } } - } + } }, "ideprocessoirrf": { "required": false, @@ -135,10 +133,10 @@ "codsusp": { "required": true, "type": "string", - "pattern": "^[0-9]{1,14}" + "pattern": "^[0-9]{1,14}$" } } - } + } }, "ideprocessofgts": { "required": false, @@ -154,7 +152,7 @@ "$ref": "#/definitions/string20" } } - } + } } } }, @@ -172,7 +170,7 @@ "type": ["string","null"], "$ref": "#/definitions/periodo" } - } + } } } } \ No newline at end of file diff --git a/jsonSchemes/v_S_01_00_00/evtTotConting.schema b/jsonSchemes/v_S_01_00_00/evtTotConting.schema index a3b0881a..e7c7f879 100755 --- a/jsonSchemes/v_S_01_00_00/evtTotConting.schema +++ b/jsonSchemes/v_S_01_00_00/evtTotConting.schema @@ -17,7 +17,7 @@ "perapur": { "required": true, "type": "string", - "pattern": "^(19[0-9][0-9]|2[0-9][0-9][0-9])([-](0?[1-9]|1[0-2]))?$" + "$ref": "#/definitions/periodo" }, "nmresp": { "required": true,