OSDN > Find Software > Mantis Monitor > SCM > SVN > Commit

Mantis Monitor

R/O
SSH
HTTPS

mantisbtmonitor: Commit

Commit MetaInfo

Revision	27 (tree)
Time	2017-09-07 06:32:13
Author	derekwildstar

Log Message

- Anexação de arquivos funcional! :)

Change Summary

modified: trunk/client/bin/xtr/AttachmentsToDp.xtr (diff)
modified: trunk/client/prj/MantisNotification.bdsproj (diff)
modified: trunk/client/res/Attachments.xml (diff)
modified: trunk/client/src/lib/UFunctions.pas (diff)
modified: trunk/client/src/lib/UMNWSWrapperFunctions.pas (diff)
modified: trunk/client/src/lib/mnws.pas (diff)
modified: trunk/client/src/UFormIssue.dfm (diff)
modified: trunk/client/src/UFormIssue.pas (diff)

Incremental Difference

--- trunk/client/prj/MantisNotification.bdsproj (revision 26)

+++ trunk/client/prj/MantisNotification.bdsproj (revision 27)

		@@ -150,7 +150,7 @@
150	150	<VersionInfo Name="MajorVer">1</VersionInfo>
151	151	<VersionInfo Name="MinorVer">2</VersionInfo>
152	152	<VersionInfo Name="Release">3</VersionInfo>
153		- <VersionInfo Name="Build">543</VersionInfo>
	153	+ <VersionInfo Name="Build">570</VersionInfo>
154	154	<VersionInfo Name="Debug">False</VersionInfo>
155	155	<VersionInfo Name="PreRelease">False</VersionInfo>
156	156	<VersionInfo Name="Special">False</VersionInfo>

		@@ -162,7 +162,7 @@
162	162	<VersionInfoKeys>
163	163	<VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
164	164	<VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
165		- <VersionInfoKeys Name="FileVersion">1.2.3.543</VersionInfoKeys>
	165	+ <VersionInfoKeys Name="FileVersion">1.2.3.570</VersionInfoKeys>
166	166	<VersionInfoKeys Name="InternalName"></VersionInfoKeys>
167	167	<VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
168	168	<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

--- trunk/client/res/Attachments.xml (revision 26)

+++ trunk/client/res/Attachments.xml (revision 27)

		@@ -1 +1 @@
1		-<?xml version="1.0" standalone="yes"?> <DATAPACKET Version="2.0"><METADATA><FIELDS><FIELD attrname="Id" fieldtype="i4"/><FIELD attrname="Filename" fieldtype="string" WIDTH="250"/><FIELD attrname="Date" fieldtype="date"/><FIELD attrname="FileSize" fieldtype="i4"/></FIELDS><PARAMS/></METADATA><ROWDATA><ROW Id="36051" Filename="PrototipoTelaUniversalFinanceiro.zip" Date="20170330" FileSize="639521"/><ROW Id="36050" Filename="PrototipoTelaUnivFinanc.png" Date="20170330" FileSize="122228"/><ROW Id="36049" Filename="TelaTJPEConsig.png" Date="20170330" FileSize="16943"/><ROW Id="36048" Filename="TelaPensionistas.png" Date="20170330" FileSize="20352"/><ROW Id="36047" Filename="TelaEntradaGenerica.png" Date="20170330" FileSize="19457"/><ROW Id="36046" Filename="TelaDescontoSassepe.png" Date="20170330" FileSize="18903"/><ROW Id="36045" Filename="TelaAtivosInativos.png" Date="20170330" FileSize="18734"/><ROW Id="36041" Filename="ImagensUniversalFinanceiro.zip" Date="20170330" FileSize="289248"/></ROWDATA></DATAPACKET>
		\ No newline at end of file
	1	+<?xml version="1.0" standalone="yes"?> <DATAPACKET Version="2.0"><METADATA><FIELDS><FIELD attrname="Id" fieldtype="i4"/><FIELD attrname="Filename" fieldtype="string" WIDTH="250"/><FIELD attrname="Date" fieldtype="dateTime"/><FIELD attrname="FileSize" fieldtype="i4"/></FIELDS><PARAMS/></METADATA><ROWDATA><ROW Id="36051" Filename="PrototipoTelaUniversalFinanceiro.zip" Date="20170330" FileSize="639521"/><ROW Id="36050" Filename="PrototipoTelaUnivFinanc.png" Date="20170330" FileSize="122228"/><ROW Id="36049" Filename="TelaTJPEConsig.png" Date="20170330" FileSize="16943"/><ROW Id="36048" Filename="TelaPensionistas.png" Date="20170330" FileSize="20352"/><ROW Id="36047" Filename="TelaEntradaGenerica.png" Date="20170330" FileSize="19457"/><ROW Id="36046" Filename="TelaDescontoSassepe.png" Date="20170330" FileSize="18903"/><ROW Id="36045" Filename="TelaAtivosInativos.png" Date="20170330" FileSize="18734"/><ROW Id="36041" Filename="ImagensUniversalFinanceiro.zip" Date="20170330" FileSize="289248"/></ROWDATA></DATAPACKET>
		\ No newline at end of file

--- trunk/client/src/lib/UFunctions.pas (revision 26)

+++ trunk/client/src/lib/UFunctions.pas (revision 27)

		@@ -19,12 +19,13 @@
19	19	function DecodeIssueInfo(AIssueData: String): TIssueInfo;
20	20	procedure OpenIssueWithMantis(AIssueNumber: Cardinal);
21	21	procedure DownloadAttachment(AAttachmentId: Cardinal; AFileName: String; AOpen: Boolean = True);
	22	+function UploadAttachment(AIssueNumber: Cardinal; AFileName: String): Cardinal;
22	23
23	24	implementation
24	25
25	26	uses
26	27	Windows, Classes, SysUtils, ShellApi, EncdDecd, UMNWSWrapperFunctions, Forms,
27		- Controls;
	28	+ Controls, UConfigurations, IdGlobalProtocols;
28	29
29	30	procedure OpenIssueWithMantis(AIssueNumber: Cardinal);
30	31	const

		@@ -85,10 +86,42 @@
85	86	end;
86	87
87	88	if AOpen then
88		- begin
89	89	ShellExecute(0, 'open', PChar(AFileName), nil, nil, SW_SHOWNORMAL);
	90	+end;
90	91
91		- end;
	92	+function UploadAttachment(AIssueNumber: Cardinal; AFileName: String): Cardinal;
	93	+var
	94	+ SS: TStringStream;
	95	+ FS: TFileStream;
	96	+ MimeType: String;
	97	+ FileContents: String;
	98	+begin
	99	+ with TIdMimeTable.Create(False) do
	100	+ try
	101	+ MimeType := GetFileMIMEType(AFileName);
	102	+ finally
	103	+ Free;
	104	+ end;
	105	+
	106	+ FS := TFileStream.Create(AFileName,fmOpenRead or fmShareExclusive);
	107	+ try
	108	+ SS := TStringStream.Create('');
	109	+ try
	110	+ SS.CopyFrom(FS,FS.Size);
	111	+ FileContents := EncodeString(SS.DataString);
	112	+ finally
	113	+ SS.Free;
	114	+ end;
	115	+ finally
	116	+ FS.Free;
	117	+ end;
	118	+
	119	+ Result := AddAttachment(Configurations.UserName
	120	+ ,Configurations.Password
	121	+ ,AIssueNumber
	122	+ ,ExtractFileName(AFileName)
	123	+ ,MimeType
	124	+ ,FileContents);
92	125	end;
93	126
94	127	end.

--- trunk/client/src/lib/UMNWSWrapperFunctions.pas (revision 26)

+++ trunk/client/src/lib/UMNWSWrapperFunctions.pas (revision 27)

		@@ -18,12 +18,12 @@
18	18	function GetIssueInfo(AIssueNumber: Cardinal): String;
19	19	function GetAttachments(AIssueNumber: Cardinal; AClientDataSet: TClientDataSet): Boolean;
20	20	function GetAttachmentData(AAttachmentId: Cardinal): String;
	21	+function AddAttachment(AUserName: String; APassword: String; AIssueId: Cardinal; AFileName: String; AMimeType: String; ABase64Contents: String): Cardinal;
21	22
22		-
23	23	implementation
24	24
25	25	uses
26		- mnws, Windows, SysUtils, Classes, XMLXForm;
	26	+ mnws, Windows, SysUtils, Classes, XMLXForm, IdGlobalProtocols;
27	27
28	28	function Login(PUserName, PPassword: String): TUserInfo;
29	29	var

		@@ -49,7 +49,6 @@
49	49
50	50	function UserIssues(AUserId: Integer): String;
51	51	begin
52		-// ZeroMemory(@Result,SizeOf(TUserInfo));
53	52	Result := GetmnwsPortType.userIssues(AUserId);
54	53	end;
55	54

		@@ -110,7 +109,27 @@
110	109	Result := GetmnwsPortType.getAttachmentData(AAttachmentId);
111	110	end;
112	111
	112	+function AddAttachment(AUserName: String; APassword: String; AIssueId: Cardinal; AFileName: String; AMimeType: String; ABase64Contents: String): Cardinal;
	113	+var
	114	+ Retorno: String;
	115	+begin
	116	+ // Erros genéricos: Exceções levantadas e que não foram tratadas no servidor
	117	+ try
	118	+ Retorno := GetmnwsPortType.addAttachment(AUserName, APassword, AIssueId, AFileName, AMimeType, ABase64Contents);
	119	+ except
	120	+ on E: Exception do
	121	+ raise Exception.Create('Ocorreu um erro ao anexar o arquivo. A mensagem de erro foi: '#13#10#13#10 + E.Message);
	122	+ end;
113	123
	124	+ // Erros do serviço: Exceções levantadas e que foram tratadas no servidor
	125	+ try
	126	+ Result := StrToInt(Retorno);
	127	+ except
	128	+ on E: Exception do
	129	+ raise Exception.Create('Ocorreu um erro ao anexar o arquivo. O Webservice retornou a seguinte mensagem de erro: '#13#10#13#10 + Retorno);
	130	+ end;
	131	+end;
	132	+
114	133	initialization
115	134
116	135	end.

--- trunk/client/src/lib/mnws.pas (revision 26)

+++ trunk/client/src/lib/mnws.pas (revision 27)

		@@ -4,7 +4,7 @@
4	4	// WSDL : http://192.168.251.88/mnws/index.php?wsdl
5	5	// Encoding : UTF-8
6	6	// Version : 1.0
7		-// (30/08/2017 16:19:30 - 1.33.2.5)
	7	+// (06/09/2017 15:56:04 - 1.33.2.5)
8	8	// ************************************************************************ //
9	9
10	10	unit mnws;

		@@ -45,6 +45,7 @@
45	45	function getStatuses: WideString; stdcall;
46	46	function getAttachments(const aIssueId: integer): WideString; stdcall;
47	47	function getAttachmentData(const aAttachmentId: integer): WideString; stdcall;
	48	+ function addAttachment(const aUserName: WideString; const aPassword: WideString; const aIssueId: integer; const aFileName: WideString; const aMimeType: WideString; const aBase64Contents: WideString): WideString; stdcall;
48	49	end;
49	50
50	51	function GetmnwsPortType(UseWSDL: Boolean=System.False; Addr: string=''; HTTPRIO: THTTPRIO = nil): mnwsPortType;

--- trunk/client/src/UFormIssue.pas (revision 26)

+++ trunk/client/src/UFormIssue.pas (revision 27)

		@@ -56,12 +56,16 @@
56	56	KRDGAttachments: TKRKDBGrid;
57	57	PAABAttachments: TPopupActionBar;
58	58	MNUIDownloadAttachment: TMenuItem;
	59	+ MNUIDownloadAndOpen: TMenuItem;
	60	+ SADIAttachment: TSaveDialog;
	61	+ MNUIN1: TMenuItem;
	62	+ MNUIAttachNew: TMenuItem;
	63	+ OPDIAttachment: TOpenDialog;
59	64	CLDSAttachmentsId: TIntegerField;
60	65	CLDSAttachmentsFilename: TStringField;
61		- CLDSAttachmentsDate: TDateField;
	66	+ CLDSAttachmentsDate: TDateTimeField;
62	67	CLDSAttachmentsFileSize: TIntegerField;
63		- MNUIDownloadAndOpen: TMenuItem;
64		- SADIAttachment: TSaveDialog;
	68	+ procedure MNUIAttachNewClick(Sender: TObject);
65	69	procedure MNUIDownloadAndOpenClick(Sender: TObject);
66	70	procedure MNUIDownloadAttachmentClick(Sender: TObject);
67	71	procedure KRDGRelatedIssuesDrawColumnCell(Sender: TObject;

		@@ -201,6 +205,16 @@
201	205	GetRelatedIssues(FIssueInfo.Id,CLDSRelatedIssues);
202	206	end;
203	207
	208	+procedure TFormIssue.MNUIAttachNewClick(Sender: TObject);
	209	+begin
	210	+ inherited;
	211	+ if OPDIAttachment.Execute then
	212	+ begin
	213	+ UploadAttachment(FIssueInfo.Id,OPDIAttachment.FileName);
	214	+ LoadAttachments;
	215	+ end;
	216	+end;
	217	+
204	218	procedure TFormIssue.MNUIDownloadAndOpenClick(Sender: TObject);
205	219	begin
206	220	inherited;

Show on old repository browser