root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 628

Browse Source 
Files correlati     : pa
Commento            : Sistemato Log, aggiunto warning in caso di allegato non esistente
This commit is contained in:
Mattia Tollari 2018-10-04 10:38:46 +02:00
parent 4dd0966f5d
commit 37301cc4c5
2 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/pa0.vcxproj
View File

@ -157,7 +157,10 @@
</CustomBuildStep> </CustomBuildStep>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="campo.rc" /> <ResourceCompile Include="campo.rc">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\src\fe\felib.cpp" /> <ClCompile Include="..\src\fe\felib.cpp" />

61
src/pa/pa0100.cpp
View File

@ -574,12 +574,12 @@ void TPA_mask::fill()
row->add(doc_pa.get(DOC_NDOC).as_int()); row->add(doc_pa.get(DOC_NDOC).as_int());
row->add(doc_pa.get(DOC_DATADOC).as_date()); row->add(doc_pa.get(DOC_DATADOC).as_date());
row->add(clifo_pa.get(CFV_CODCF).as_int()); row->add(clifo_pa.get(CFV_CODCF).as_int());
row->add(clifo_pa.get("20."CLI_RAGSOC).as_string()); row->add(clifo_pa.get("20." CLI_RAGSOC).as_string());
row->add(clifo_pa.get(CFV_PADESTIN).as_string()); row->add(clifo_pa.get(CFV_PADESTIN).as_string());
row->add(clifo_pa.get(CFV_PARIFAMM).as_string()); row->add(clifo_pa.get(CFV_PARIFAMM).as_string());
row->add(clifo_pa.get("20."CLI_COFI).as_string()); row->add(clifo_pa.get("20." CLI_COFI).as_string());
bool split = clifo_pa.get("20."CLI_SPLITPAY).as_bool(); bool split = clifo_pa.get("20." CLI_SPLITPAY).as_bool();
if (split) if (split)
{ {
const long numreg = doc_pa.get(DOC_NUMREG).as_int(); const long numreg = doc_pa.get(DOC_NUMREG).as_int();
@ -868,22 +868,25 @@ const TRectype& TDoc2Paf::cco(const TRectype& doc) const
void TDoc2Paf::log(int severity, const char* msg) void TDoc2Paf::log(int severity, const char* msg)
{ {
if (severity < 0) if (_log == nullptr)
{
_logpaf = msg;
} else
if (_log == NULL)
{ {
_log = new TLog_report; _log = new TLog_report;
if (_logpaf.full())
{
TString txt;
txt << _logpaf << ": " << msg;
_log->log(severity, txt);
}
else
_log->log(severity, msg);
} }
if (severity < 0)
{
_logpaf = msg;
}
else
{
if (_logpaf.full())
{
TString txt;
txt << _logpaf << ": " << msg;
_log->log(severity, txt);
}
else
_log->log(severity, msg);
}
} }
bool TDoc2Paf::show_log() bool TDoc2Paf::show_log()
@ -1047,7 +1050,7 @@ bool TDoc2Paf::elabora(TDocumentoEsteso& doc)
if (numrea.full()) if (numrea.full())
{ {
paf0200f.set("P2_ISCRREANUM", numrea); paf0200f.set("P2_ISCRREANUM", numrea);
paf0200f.set("P2_ISCRREAUFF", unloc.get("13->"COM_PROVCOM)); paf0200f.set("P2_ISCRREAUFF", unloc.get("13->" COM_PROVCOM));
} }
} }
@ -1541,14 +1544,24 @@ bool TDoc2Paf::elabora(TDocumentoEsteso& doc)
FOR_EACH_TOKEN(allegati, row) FOR_EACH_TOKEN(allegati, row)
{ {
const TToken_string entry(row); const TToken_string entry(row);
if (entry.get(0, fname) && fname.exist()) if (entry.get(0, fname))
{ {
paf2600f.set("PP_KEYNPROGR", ++nprogr); if (fname.exist())
paf2600f.set("PP_NOMEATTACHMENT", fname.name()); {
paf2600f.set("PP_ATTACHMENT", fname); paf2600f.set("PP_KEYNPROGR", ++nprogr);
fname.upper(); // serve estensione maiuscola paf2600f.set("PP_NOMEATTACHMENT", fname.name());
paf2600f.set("PP_FMTATTACHMENT", fname.ext()); paf2600f.set("PP_ATTACHMENT", fname);
paf2600f.insert(); fname.upper(); // serve estensione maiuscola
paf2600f.set("PP_FMTATTACHMENT", fname.ext());
paf2600f.insert();
}
else
{
TString msg, filename;
entry.get(1, filename);
msg << "L'allegato \"" << filename << "\" non esiste e non sarà importato nel XML";
log(1, msg);
}
} }
} }
} }