pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

tvplanit: Consistent field mappings.

Browse Source 
Changed PlanIt field names: 
 Contacts: 
    Position -> Job_Position 
 Events: 
    AlarmAdv -> AlarmAdvance
    AlarmAdvType -> AlarmAdvanceType
    CustInterval -> CustomInterval.

Previous changes: 
 Resource: 
    Active --> ResourceActive
 Events: 
    AlarmWavPath --> DingPath
    Note --> Notes 
    Location (new);
 Contacts:
    Note --> Notes

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4725 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-06-12 12:53:26 +00:00
parent d3a8c84314
commit 968af22828
12 changed files with 152 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/tvplanit/source/vpadvds.pas
View File

@ -593,12 +593,12 @@ begin
Qry.FieldByName('DingPath').AsString := Event.DingPath;
Qry.FieldByName('AllDayEvent').AsBoolean := Event.AllDayEvent;
Qry.FieldByName('AlarmSet').AsBoolean := Event.AlarmSet;
Qry.FieldByName('AlarmAdvance').AsInteger := Event.AlarmAdv;
Qry.FieldByName('AlarmAdvanceType').AsInteger := Ord(Event.AlarmAdvType);
Qry.FieldByName('AlarmAdvance').AsInteger := Event.AlarmAdvance;
Qry.FieldByName('AlarmAdvanceType').AsInteger := Ord(Event.AlarmAdvanceType);
Qry.FieldByName('SnoozeTime').AsDateTime := Event.SnoozeTime;
Qry.FieldByName('RepeatCode').AsInteger := Ord(Event.RepeatCode);
Qry.FieldByName('RepeatRangeEnd').AsDateTime := Event.RepeatRangeEnd;
Qry.FieldByName('CustomInterval').AsInteger := Event.CustInterval;
Qry.FieldByName('CustomInterval').AsInteger := Event.CustomInterval;
Qry.FieldByName('UserField0').AsString := Event.UserField0;
Qry.FieldByName('UserField1').AsString := Event.UserField1;
Qry.FieldByName('UserField2').AsString := Event.UserField2;
@ -640,14 +640,14 @@ begin
Qry.ParamByName('Notes').AsString := Event.Notes;
Qry.ParamByName('SnTime').AsDateTime := Event.SnoozeTime;
Qry.ParamByName('Cat').AsInteger := Event.Category;
Qry.ParamByName('DPath').AsString := Event.AlarmWavPath;
Qry.ParamByName('DPath').AsString := Event.DingPath;
Qry.ParamByName('ADEvent').AsBoolean := Event.AllDayEvent;
Qry.ParamByName('ASet').AsBoolean := Event.AlarmSet;
Qry.ParamByName('AAdvance').AsInteger := Event.AlarmAdv;
Qry.ParamByName('AAdvanceType').AsInteger := Ord(Event.AlarmAdvType);
Qry.ParamByName('AAdvance').AsInteger := Event.AlarmAdvance;
Qry.ParamByName('AAdvanceType').AsInteger := Ord(Event.AlarmAdvanceType);
Qry.ParamByName('RCode').AsInteger := Ord(Event.RepeatCode);
Qry.ParamByName('RRangeEnd').AsDateTime := Event.RepeatRangeEnd;
Qry.ParamByName('CInterval').AsInteger := Event.CustInterval;
Qry.ParamByName('CInterval').AsInteger := Event.CustomInterval;
Qry.ParamByName('UserField0').AsString := Event.UserField0;
Qry.ParamByName('UserField1').AsString := Event.UserField1;
Qry.ParamByName('UserField2').AsString := Event.UserField2;
@ -731,7 +731,7 @@ begin
{ - end}
Qry.FieldByName('Title').AsString := Contact.Title;
Qry.FieldByName('Company').AsString := Contact.Company;
Qry.FieldByName('Job_Position').AsString := Contact.Position;
Qry.FieldByName('Job_Position').AsString := Contact.Job_Position;
Qry.FieldByName('EMail').AsString := Contact.EMail;
Qry.FieldByName('Address').AsString := Contact.Address;
Qry.FieldByName('City').AsString := Contact.City;
@ -804,7 +804,7 @@ begin
{ - end}
Qry.ParamByName('Title').AsString := Contact.Title;
Qry.ParamByName('Company').AsString := Contact.Company;
Qry.ParamByName('Job_Position').AsString := Contact.Position;
Qry.ParamByName('Job_Position').AsString := Contact.Job_Position;
Qry.ParamByName('EMail').AsString := Contact.EMail;
Qry.ParamByName('Address').AsString := Contact.Address;
Qry.ParamByName('City').AsString := Contact.City;

9
components/tvplanit/source/vpalarmdlg.pas
View File

@ -238,6 +238,8 @@ end;
{=====}
procedure TAlarmNotifyForm.DismissBtnClick(Sender: TObject);
var
t0: TTime;
begin
if Event.RepeatCode = rtNone then
begin
@ -246,9 +248,12 @@ begin
else
begin
SnoozeDelay := 0;
t0 := Trunc(Now) + frac(Event.StartTime) - EncodeTime(0, Event.AlarmAdvance, 0, 0);
case Event.RepeatCode of
rtDaily:Event.SnoozeTime := Trunc(Now)+1+(Frac(Event.StartTime)-EncodeTime(0,Event.AlarmAdv,0,0));
rtWeekly:Event.SnoozeTime := Trunc(Now)+7+(Frac(Event.StartTime)-EncodeTime(0,Event.AlarmAdv,0,0));
rtDaily:
Event.SnoozeTime := t0 + 1; //Trunc(Now)+1+(Frac(Event.StartTime)-EncodeTime(0,Event.AlarmAdvance,0,0));
rtWeekly:
Event.SnoozeTime := t0 + 7; //Trunc(Now)+7+(Frac(Event.StartTime)-EncodeTime(0,Event.AlarmAdvance,0,0));
//TODO: rtMonthlyByDay:
//TODO: rtMonthlyByDate:
//TODO: rtYearlyByDay:

2
components/tvplanit/source/vpbaseds.pas
View File

@ -566,7 +566,7 @@ begin
Event := Resource.Schedule.GetEvent(I);
if (Event <> nil) and Event.AlarmSet then begin
AdvanceTime := GetAlarmAdvanceTime(Event.AlarmAdv, Event.AlarmAdvType);
AdvanceTime := GetAlarmAdvanceTime(Event.AlarmAdvance, Event.AlarmAdvanceType);
AlarmTime := Event.StartTime - AdvanceTime;
{ if the AlarmTime has already passed, then show the alarm notification }

8
components/tvplanit/source/vpbdeds.pas
View File

@ -518,7 +518,7 @@ begin
Qry.FieldByName('ResourceID').AsInteger := Resource.ResourceID;
Qry.FieldByName('Description').AsString := Resource.Description;
Qry.FieldByName('Notes').AsString := Resource.Notes;
Qry.FieldByName('ResourceActive').AsBoolean := Resource.Active;
Qry.FieldByName('ResourceActive').AsBoolean := Resource.ResourceActive;
Qry.FieldByName('UserField0').AsString := Resource.UserField0;
Qry.FieldByName('UserField1').AsString := Resource.UserField1;
Qry.FieldByName('UserField2').AsString := Resource.UserField2;
@ -637,12 +637,12 @@ begin
Qry.FieldByName('DingPath').AsString := Event.DingPath;
Qry.FieldByName('AllDayEvent').AsBoolean := Event.AllDayEvent;
Qry.FieldByName('AlarmSet').AsBoolean := Event.AlarmSet;
Qry.FieldByName('AlarmAdvance').AsInteger := Event.AlarmAdv;
Qry.FieldByName('AlarmAdvanceType').AsInteger := Ord(Event.AlarmAdvType);
Qry.FieldByName('AlarmAdvance').AsInteger := Event.AlarmAdvance;
Qry.FieldByName('AlarmAdvanceType').AsInteger := Ord(Event.AlarmAdvanceType);
Qry.FieldByName('SnoozeTime').AsDateTime := Event.SnoozeTime;
Qry.FieldByName('RepeatCode').AsInteger := Ord(Event.RepeatCode);
Qry.FieldByName('RepeatRangeEnd').AsDateTime := Event.RepeatRangeEnd;
Qry.FieldByName('CustomInterval').AsInteger := Event.CustInterval;
Qry.FieldByName('CustomInterval').AsInteger := Event.CustomInterval;
Qry.FieldByName('UserField0').AsString := Event.UserField0;
Qry.FieldByName('UserField1').AsString := Event.UserField1;
Qry.FieldByName('UserField2').AsString := Event.UserField2;

8
components/tvplanit/source/vpcontacteditdlg.pas
View File

@ -222,7 +222,7 @@ begin
else
Contact.State := StateEdit.Text;
Contact.Zip := ZipCodeEdit.Text;
Contact.Position := PositionEdit.Text;
Contact.Job_Position := PositionEdit.Text;
Contact.Title := TitleEdit.Text;
Contact.EMail := EMailEdit.Text;
Contact.Company := CompanyEdit.Text;
@ -235,7 +235,7 @@ begin
Contact.Country := cboxCountry.Text
else
Contact.Country := edtCountry.Text;
Contact.Note := NoteEdit.Text;
Contact.Notes := NoteEdit.Text;
Contact.Category := cboxCategory.ItemIndex;
Contact.Custom1 := Custom1Edit.Text;
Contact.Custom2 := Custom2Edit.Text;
@ -263,7 +263,7 @@ begin
AddressEdit.Text := Contact.Address;
CityEdit.Text := Contact.City;
ZipCodeEdit.Text := Contact.Zip;
PositionEdit.Text := Contact.Position;
PositionEdit.Text := Contact.Job_Position;
TitleEdit.Text := Contact.Title;
EMailEdit.Text := Contact.EMail;
CompanyEdit.Text := Contact.Company;
@ -272,7 +272,7 @@ begin
Phone3Edit.Text := Contact.Phone3;
Phone4Edit.Text := Contact.Phone4;
Phone5Edit.Text := Contact.Phone5;
NoteEdit.Text := Contact.Note;
NoteEdit.Text := Contact.Notes;
cboxCategory.ItemIndex := Contact.Category;
Custom1Edit.Text := Contact.Custom1;
Custom2Edit.Text := Contact.Custom2;

23
components/tvplanit/source/vpdata.pas
View File

@ -35,7 +35,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,
LMessages, LCLProc, LCLType,
{$ELSE}
Windows,
{$ENDIF}
@ -138,7 +138,8 @@ type
property EventsDirty: Boolean read FEventsDirty write FEventsDirty;
property ContactsDirty: Boolean read FContactsDirty write FContactsDirty;
property TasksDirty: Boolean read FTasksDirty write FTasksDirty;
property Active: Boolean read FActive write FActive;
property ResourceActive: Boolean read FActive write FActive;
property Active: Boolean read FActive write FActive; deprecated 'Use "ResourceActive" instead';
property Owner: TVpResources read FOwner;
property ItemIndex: integer read FItemIndex;
property Notes: string read FNotes write SetNotes;
@ -260,19 +261,22 @@ type
property Note: String read FNotes write SetNotes; deprecated 'Use "Notes" instead';
property Category : Integer read FCategory write SetCategory;
property AlarmSet : Boolean read FAlarmSet write SetAlarmSet;
property AlarmAdv : Integer read FAlarmAdv write SetAlarmAdv;
property AlarmAdvance: Integer read FAlarmAdv write SetAlarmAdv;
property AlarmAdv : Integer read FAlarmAdv write SetAlarmAdv; deprecated 'Use "AlarmAdvance" instead';
property Location: string read FLocation write SetLocation;
property Loading : Boolean read FLoading write FLoading;
{ 0=Minutes, 1=Hours, 2=Days }
property AlarmAdvType : TVpAlarmAdvType read FAlarmAdvType write SetAlarmAdvType;
property AlarmAdvanceType: TVpAlarmAdvType read FAlarmAdvType write SetAlarmAdvType;
property AlarmAdvType : TVpAlarmAdvType read FAlarmAdvType write SetAlarmAdvType; deprecated 'Use "AlarmAdvanceType" instead';
property SnoozeTime : TDateTime read FSnoozeTime write SetSnoozeTime;
{ rtNone, rtDaily, rtWeekly, rtMonthlyByDay, rtMonthlyByDate, }
{ rtYearlyByDay, rtYearlyByDate, rtCustom }
property RepeatCode : TVpRepeatType read FRepeatCode write SetRepeatCode;
property RepeatCode: TVpRepeatType read FRepeatCode write SetRepeatCode;
property RepeatRangeEnd: TDateTime read FRepeatRangeEnd write SetRepeatRangeEnd;
{ Custom Repeat Interval in seconds }
{ is Zero if IntervalCode <> 7 }
property CustInterval : Integer read FCustInterval write SetCustInterval;
property CustomInterval : Integer read FCustInterval write SetCustInterval;
property CustInterval : Integer read FCustInterval write SetCustInterval; deprecated 'Use "CustomInterval" instead';
property Owner: TVpSchedule read FOwner;
{ Reserved for your use }
property UserField0: string read FUserField0 write FUserField0;
@ -507,7 +511,8 @@ type
property Changed : Boolean read FChanged write SetChanged;
property Deleted : Boolean read FDeleted write SetDeleted;
property RecordID : Integer read FRecordID write SetRecordID;
property Position : string read FPosition write SetPosition;
property Job_Position : string read FPosition write SetPosition;
property Position : string read FPosition write SetPosition; deprecated 'Use "Job_Position" instead';
property FirstName : string read FFirstName write SetFirstName;
property LastName : string read FLastName write SetLastName;
property BirthDate : TDateTime read FBirthdate write SetBirthdate;
@ -613,7 +618,7 @@ begin
Resource.Loading := true;
Resource.FItemIndex := FResourceList.Add(Resource);
Resource.ResourceID := ResID;
Resource.Active := true;
Resource.ResourceActive := true;
Resource.Loading := false;
result := Resource;
except
@ -1269,7 +1274,7 @@ begin
{ the event start time is evenly divisible by the event's custom }
{ interval, then we have a recurrence on this day }
result := (Trunc(Day) - Trunc(Event.StartTime))
mod Event.CustInterval = 0;
mod Event.CustomInterval = 0;
end;
end;
end;

54
components/tvplanit/source/vpdbds.pas
View File

@ -987,7 +987,7 @@ begin
Res.ResourceID := ResourceTable.FieldByName('ResourceID').AsInteger;
Res.Description := ResourceTable.FieldByName('Description').AsString;
Res.Notes := ResourceTable.FieldByName('Notes').AsString;
Res.Active := ResourceTable.FieldByName('ResourceActive').AsBoolean;
Res.ResourceActive := ResourceTable.FieldByName('ResourceActive').AsBoolean;
Res.UserField0 := ResourceTable.FieldByName('UserField0').AsString;
Res.UserField1 := ResourceTable.FieldByName('UserField1').AsString;
Res.UserField2 := ResourceTable.FieldByName('UserField2').AsString;
@ -1001,7 +1001,7 @@ begin
Res.Loading := false;
{ Add events, contacts and tasks for the currently selected resource }
if (Res.ResourceID = ResourceID) and Res.Active then begin
if (Res.ResourceID = ResourceID) and Res.ResourceActive then begin
Resource := Res;
LoadEvents;
LoadContacts;
@ -1047,15 +1047,15 @@ begin
if F <> nil then Event.Location := F.AsString;
Event.Notes := FieldByName('Notes').AsString;
Event.Category := FieldByName('Category').AsInteger;
Event.AlarmWavPath := FieldByName('DingPath').AsString;
Event.DingPath := FieldByName('DingPath').AsString;
Event.AllDayEvent := FieldByName('AllDayEvent').AsBoolean;
Event.AlarmSet := FieldByName('AlarmSet').AsBoolean;
Event.AlarmAdv := FieldByName('AlarmAdvance').AsInteger;
Event.AlarmAdvType := TVpAlarmAdvType(FieldByName('AlarmAdvanceType').AsInteger);
Event.AlarmAdvance := FieldByName('AlarmAdvance').AsInteger;
Event.AlarmAdvanceType := TVpAlarmAdvType(FieldByName('AlarmAdvanceType').AsInteger);
Event.SnoozeTime := FieldByName('SnoozeTime').AsDateTime;
Event.RepeatCode := TVpRepeatType(FieldByName('RepeatCode').AsInteger);
Event.RepeatRangeEnd := FieldByName('RepeatRangeEnd').AsDateTime;
Event.CustInterval := FieldByName('CustomInterval').AsInteger;
Event.CustomInterval := FieldByName('CustomInterval').AsInteger;
Event.UserField0 := FieldByName('UserField0').AsString;
Event.UserField1 := FieldByName('UserField1').AsString;
Event.UserField2 := FieldByName('UserField2').AsString;
@ -1097,7 +1097,7 @@ begin
Contact.Anniversary := FieldByName('Anniversary').AsDateTime;
Contact.Title := FieldByName('Title').AsString;
Contact.Company := FieldByName('Company').AsString;
Contact.Position := FieldByName('Job_Position').AsString;
Contact.Job_Position := FieldByName('Job_Position').AsString;
Contact.EMail := FieldByName('EMail').AsString;
Contact.Address := FieldByName('Address').AsString;
Contact.City := FieldByName('City').AsString;
@ -1224,7 +1224,7 @@ begin
ContactsTable.FieldByName('Anniversary').AsDateTime := Contact.Anniversary;
ContactsTable.FieldByName('Title').AsString := Contact.Title;
ContactsTable.FieldByName('Company').AsString := Contact.Company;
ContactsTable.FieldByName('Job_Position').AsString := Contact.Position;
ContactsTable.FieldByName('Job_Position').AsString := Contact.Job_Position;
ContactsTable.FieldByName('EMail').AsString := Contact.EMail;
ContactsTable.FieldByName('Address').AsString := Contact.Address;
ContactsTable.FieldByName('City').AsString := Contact.City;
@ -1335,12 +1335,12 @@ begin
EventsTable.FieldByName('DingPath').AsString := Event.DingPath;
EventsTable.FieldByName('AllDayEvent').AsBoolean := Event.AllDayEvent;
EventsTable.FieldByName('AlarmSet').AsBoolean := Event.AlarmSet;
EventsTable.FieldByName('AlarmAdvance').AsInteger := Event.AlarmAdv;
EventsTable.FieldByName('AlarmAdvanceType').AsInteger := Ord(Event.AlarmAdvType);
EventsTable.FieldByName('AlarmAdvance').AsInteger := Event.AlarmAdvance;
EventsTable.FieldByName('AlarmAdvanceType').AsInteger := Ord(Event.AlarmAdvanceType);
EventsTable.FieldByName('SnoozeTime').AsDateTime := Event.SnoozeTime;
EventsTable.FieldByName('RepeatCode').AsInteger := Ord(Event.RepeatCode);
EventsTable.FieldByName('RepeatRangeEnd').AsDateTime := Event.RepeatRangeEnd;
EventsTable.FieldByName('CustomInterval').AsInteger := Event.CustInterval;
EventsTable.FieldByName('CustomInterval').AsInteger := Event.CustomInterval;
EventsTable.FieldByName('UserField0').AsString := Event.UserField0;
EventsTable.FieldByName('UserField1').AsString := Event.UserField1;
EventsTable.FieldByName('UserField2').AsString := Event.UserField2;
@ -1496,7 +1496,7 @@ begin
FieldByName('Description').AsString := Res.Description;
FieldByName('Notes').AsString := Res.Notes;
FieldByName('ResourceActive').AsBoolean := Res.Active;
FieldByName('ResourceActive').AsBoolean := Res.ResourceActive;
FieldByName('UserField0').AsString := Res.UserField0;
FieldByName('UserField1').AsString := Res.UserField1;
FieldByName('UserField2').AsString := Res.UserField2;
@ -1613,7 +1613,7 @@ begin
Contact.Anniversary := FieldByName('Anniversary').AsDateTime;
Contact.Title := FieldByName('Title').AsString;
Contact.Company := FieldByName('Company').AsString;
Contact.Position := FieldByName('Job_Position').AsString;
Contact.Job_Position := FieldByName('Job_Position').AsString;
Contact.EMail := FieldByName('EMail').AsString;
Contact.Address := FieldByName('Address').AsString;
Contact.City := FieldByName('City').AsString;
@ -1690,22 +1690,22 @@ begin
Event.DingPath := FieldByName('DingPath').AsString;
Event.AllDayEvent := FieldByName('AllDayEvent').AsBoolean;
Event.AlarmSet := FieldByName('AlarmSet').AsBoolean;
Event.AlarmAdv := FieldByName('AlarmAdvance').AsInteger;
Event.AlarmAdvType := TVpAlarmAdvType(
Event.AlarmAdvance := FieldByName('AlarmAdvance').AsInteger;
Event.AlarmAdvanceType := TVpAlarmAdvType(
FieldByName('AlarmAdvanceType').AsInteger);
Event.RepeatCode := TVpRepeatType(FieldByName('RepeatCode').AsInteger);
Event.RepeatRangeEnd := FieldByName('RepeatRangeEnd').AsDateTime;
Event.CustInterval := FieldByName('CustomInterval').AsInteger;
Event.UserField0 := FieldBYName('UserField0').AsString;
Event.UserField1 := FieldBYName('UserField1').AsString;
Event.UserField2 := FieldBYName('UserField2').AsString;
Event.UserField3 := FieldBYName('UserField3').AsString;
Event.UserField4 := FieldBYName('UserField4').AsString;
Event.UserField5 := FieldBYName('UserField5').AsString;
Event.UserField6 := FieldBYName('UserField6').AsString;
Event.UserField7 := FieldBYName('UserField7').AsString;
Event.UserField8 := FieldBYName('UserField8').AsString;
Event.UserField9 := FieldBYName('UserField9').AsString;
Event.CustomInterval := FieldByName('CustomInterval').AsInteger;
Event.UserField0 := FieldByName('UserField0').AsString;
Event.UserField1 := FieldByName('UserField1').AsString;
Event.UserField2 := FieldByName('UserField2').AsString;
Event.UserField3 := FieldByName('UserField3').AsString;
Event.UserField4 := FieldByName('UserField4').AsString;
Event.UserField5 := FieldByName('UserField5').AsString;
Event.UserField6 := FieldByName('UserField6').AsString;
Event.UserField7 := FieldByName('UserField7').AsString;
Event.UserField8 := FieldByName('UserField8').AsString;
Event.UserField9 := FieldByName('UserField9').AsString;
Event.Loading := false;
end;
@ -1781,7 +1781,7 @@ begin
Resource.ResourceID := ResourceID;
Resource.Description := FieldByName('Description').AsString;
Resource.Notes := FieldByName('Notes').AsString;
Resource.Active := FieldByName('ResourceActive').AsBoolean;
Resource.ResourceActive := FieldByName('ResourceActive').AsBoolean;
Resource.UserField0 := FieldByName('UserField0').AsString;
Resource.UserField1 := FieldByName('UserField1').AsString;
Resource.UserField2 := FieldByName('UserField2').AsString;

31
components/tvplanit/source/vpdbisamds.pas
View File

@ -599,7 +599,7 @@ begin
Qry.ParamByName('ID').AsInteger := Event.RecordID;
Qry.Open;
if Qry.FieldByName('Location') <> nil then begin
if Qry.FieldByName('Location') <> nil then begin // new
FixedLoc := 'Location, ';
FixedLocP := ':Loc, ';
end else begin
@ -624,12 +624,12 @@ begin
Qry.FieldByName('DingPath').AsString := Event.DingPath;
Qry.FieldByName('AllDayEvent').AsBoolean := Event.AllDayEvent;
Qry.FieldByName('AlarmSet').AsBoolean := Event.AlarmSet;
Qry.FieldByName('AlarmAdvance').AsInteger := Event.AlarmAdv;
Qry.FieldByName('AlarmAdvanceType').AsInteger := Ord(Event.AlarmAdvType);
Qry.FieldByName('AlarmAdvance').AsInteger := Event.AlarmAdvance;
Qry.FieldByName('AlarmAdvanceType').AsInteger := Ord(Event.AlarmAdvanceType);
Qry.FieldByName('SnoozeTime').AsDateTime := Event.SnoozeTime;
Qry.FieldByName('RepeatCode').AsInteger := Ord(Event.RepeatCode);
Qry.FieldByName('RepeatRangeEnd').AsDateTime := Event.RepeatRangeEnd;
Qry.FieldByName('CustomInterval').AsInteger := Event.CustInterval;
Qry.FieldByName('CustomInterval').AsInteger := Event.CustomInterval;
Qry.FieldByName('UserField0').AsString := Event.UserField0;
Qry.FieldByName('UserField1').AsString := Event.UserField1;
Qry.FieldByName('UserField2').AsString := Event.UserField2;
@ -670,14 +670,14 @@ begin
Qry.ParamByName('Notes').AsString := Event.Note;
Qry.ParamByName('SnTime').AsDateTime := Event.SnoozeTime;
Qry.ParamByName('Cat').AsInteger := Event.Category;
Qry.ParamByName('DPath').AsString := Event.AlarmWavPath;
Qry.ParamByName('DPath').AsString := Event.DingPath;
Qry.ParamByName('ADEvent').AsBoolean := Event.AllDayEvent;
Qry.ParamByName('ASet').AsBoolean := Event.AlarmSet;
Qry.ParamByName('AAdvance').AsInteger := Event.AlarmAdv;
Qry.ParamByName('AAdvanceType').AsInteger := Ord(Event.AlarmAdvType);
Qry.ParamByName('AAdvance').AsInteger := Event.AlarmAdvance;
Qry.ParamByName('AAdvanceType').AsInteger := Ord(Event.AlarmAdvanceType);
Qry.ParamByName('RCode').AsInteger := Ord(Event.RepeatCode);
Qry.ParamByName('RRangeEnd').AsDateTime := Event.RepeatRangeEnd;
Qry.ParamByName('CInterval').AsInteger := Event.CustInterval;
Qry.ParamByName('CInterval').AsInteger := Event.CustomInterval;
Qry.ParamByName('UserField0').AsString := Event.UserField0;
Qry.ParamByName('UserField1').AsString := Event.UserField1;
Qry.ParamByName('UserField2').AsString := Event.UserField2;
@ -765,7 +765,7 @@ begin
Qry.FieldByName('LastName').AsString := Contact.LastName;
Qry.FieldByName('Title').AsString := Contact.Title;
Qry.FieldByName('Company').AsString := Contact.Company;
Qry.FieldByName('Job_Position').AsString := Contact.Position;
Qry.FieldByName('Job_Position').AsString := Contact.Job_Position;
Qry.FieldByName('EMail').AsString := Contact.EMail;
Qry.FieldByName('Address').AsString := Contact.Address;
Qry.FieldByName('City').AsString := Contact.City;
@ -830,7 +830,7 @@ begin
Qry.ParamByName('LastName').AsString := Contact.LastName;
Qry.ParamByName('Title').AsString := Contact.Title;
Qry.ParamByName('Company').AsString := Contact.Company;
Qry.ParamByName('Job_Position').AsString := Contact.Position;
Qry.ParamByName('Job_Position').AsString := Contact.Job_Position;
Qry.ParamByName('EMail').AsString := Contact.EMail;
Qry.ParamByName('Address').AsString := Contact.Address;
Qry.ParamByName('City').AsString := Contact.City;
@ -1316,7 +1316,7 @@ begin
Size := 250;
Required := false;
end;
{ Description }
{ Notes }
with AddFieldDef do begin
Name := 'Notes';
DataType := ftMemo;
@ -1439,7 +1439,14 @@ begin
Size := 250;
Required := false;
end;
{ Note }
{ Locataion } // new
with AddFieldDef do begin
Name := 'Location';
DataType := ftString;
Size := 255;
Required := false;
end;
{ Notes }
with AddFieldDef do begin
Name := 'Notes';
DataType := ftMemo;

2
components/tvplanit/source/vpevnteditdlg.lfm
View File

@ -342,7 +342,7 @@ object DlgEventEdit: TDlgEventEdit
TabOrder = 10
Wrap = False
end
object AlarmAdvType: TComboBox
object AlarmAdvanceType: TComboBox
Left = 231
Height = 23
Top = 167

26
components/tvplanit/source/vpevnteditdlg.pas
View File

@ -92,7 +92,7 @@ type
Category: TComboBox;
RecurringType: TComboBox;
IntervalUpDown: TUpDown;
AlarmAdvType: TComboBox;
AlarmAdvanceType: TComboBox;
AdvanceUpDown: TUpDown;
CBAllDay: TCheckBox;
edtUnusedPlaceholder: TEdit;
@ -307,7 +307,7 @@ begin
StartTimeChange(Self);
CBAllDay.Checked := Event.AllDayEvent;
AlarmWavPath := Event.AlarmWavPath;
AlarmWavPath := Event.DingPath;
StartDate.Enabled := not CBAllDay.Checked;
EndDate.Enabled := not CBAllDay.Checked;
@ -322,11 +322,11 @@ begin
if not Event.AlarmSet then
AlarmAdvance.Text := '15'
else
AlarmAdvance.Text := IntToStr(Event.AlarmAdv);
AlarmAdvType.ItemIndex := Ord(Event.AlarmAdvType);
AlarmAdvance.Text := IntToStr(Event.AlarmAdvance);
AlarmAdvanceType.ItemIndex := Ord(Event.AlarmAdvanceType);
RecurringType.ItemIndex := Ord(Event.RepeatCode);
RecurringTypeChange(Self);
FCustomInterval.Text := IntToStr(Event.CustInterval);
FCustomInterval.Text := IntToStr(Event.CustomInterval);
Category.Items.Clear;
@ -351,10 +351,10 @@ begin
Event.Notes := NotesMemo.Text;
Event.Category := Category.ItemIndex;
Event.AlarmSet := AlarmSet.Checked;
Event.AlarmAdv := StrToIntDef(AlarmAdvance.Text, 0);
Event.AlarmAdvType := TVpAlarmAdvType(AlarmAdvType.ItemIndex);
Event.AlarmAdvance := StrToIntDef(AlarmAdvance.Text, 0);
Event.AlarmAdvanceType := TVpAlarmAdvType(AlarmAdvanceType.ItemIndex);
Event.RepeatCode := TVpRepeatType(RecurringType.ItemIndex);
Event.CustInterval := StrToIntDef(FCustomInterval.Text, 0);
Event.CustomInterval := StrToIntDef(FCustomInterval.Text, 0);
Event.AllDayEvent := CBAllDay.Checked;
Event.DingPath := AlarmWavPath;
end;
@ -492,10 +492,10 @@ begin
RecurringType.ItemIndex := 0;
{ Alarm Advance Type }
AlarmAdvType.Items.Add(RSMinutes);
AlarmAdvType.Items.Add(RSHours);
AlarmAdvType.Items.Add(RSDays);
AlarmAdvType.ItemIndex := 0;
AlarmAdvanceType.Items.Add(RSMinutes);
AlarmAdvanceType.Items.Add(RSHours);
AlarmAdvanceType.Items.Add(RSDays);
AlarmAdvanceType.ItemIndex := 0;
end;
{=====}
@ -602,7 +602,7 @@ end;
procedure TDlgEventEdit.AlarmSetClick(Sender: TObject);
begin
AlarmAdvance.Enabled := AlarmSet.Checked;
AlarmAdvType.Enabled := AlarmSet.Checked;
AlarmAdvanceType.Enabled := AlarmSet.Checked;
AdvanceUpDown.Enabled := AlarmSet.Checked;
Event.SnoozeTime := 0.0;
end;

59
components/tvplanit/source/vpflxds.pas
View File

@ -466,8 +466,10 @@ begin
Res.Notes := ResourceTable.FieldByName(FN).AsString;
FN := GetFieldName(FResourceMappings, 'ResourceActive');
if FN = '' then
FN := GetFieldName(FResourceMappings, 'Active'); // deprecated
if FN <> '' then
Res.Active := ResourceTable.FieldByName(FN).AsBoolean;
Res.ResourceActive := ResourceTable.FieldByName(FN).AsBoolean;
FN := GetFieldName(FResourceMappings, 'UserField0');
if FN <> '' then
@ -511,7 +513,7 @@ begin
Res.Loading := false;
{ Add events, contacts and tasks for the currently selected resource }
if (Res.ResourceID = ResourceID) and Res.Active then begin
if (Res.ResourceID = ResourceID) and Res.ResourceActive then begin
Resource := Res;
LoadEvents;
LoadContacts;
@ -588,7 +590,7 @@ begin
if FN1 = '' then
FN1 := GetFieldName(FEventMappings, 'AlarmWavPath'); // deprectated
if (FN1 <> '') then
Event.AlarmWavPath := FieldByName(FN1).AsString;
Event.DingPath := FieldByName(FN1).AsString;
FN1 := GetFieldName(FEventMappings, 'AllDayEvent');
if (FN1 <> '') then
@ -598,14 +600,17 @@ begin
if (FN1 <> '') then
Event.AlarmSet := FieldByName(FN1).AsBoolean;
FN1 := GetFieldName(FEventMappings, 'AlarmAdv');
FN1 := GetFieldName(FEventMappings, 'AlarmAdvance');
if FN1 = '' then
FN1 := GetFieldName(FEventMappings, 'AlarmAdv'); // deprecated
if (FN1 <> '') then
Event.AlarmAdv := FieldByName(FN1).AsInteger;
Event.AlarmAdvance := FieldByName(FN1).AsInteger;
FN1 := GetFieldName(FEventMappings, 'AlarmAdvType');
FN1 := GetFieldName(FEventMappings, 'AlarmAdvanceType');
if FN1 = '' then
FN1 := GetFieldName(FEventMappings, 'AlarmAdvType'); // deprecated
if (FN1 <> '') then
Event.AlarmAdvType := TVpAlarmAdvType(
FieldByName(FN1).AsInteger);
Event.AlarmAdvanceType := TVpAlarmAdvType(FieldByName(FN1).AsInteger);
FN1 := GetFieldName(FEventMappings, 'SnoozeTime');
if (FN1 <> '') then
@ -619,9 +624,11 @@ begin
if (FN1 <> '') then
Event.RepeatRangeEnd := FieldByName(FN1).AsDateTime;
FN1 := GetFieldName(FEventMappings, 'CustInterval');
FN1 := GetfieldName(FEventMappings, 'CustomInterval');
if FN1 = '' then
FN1 := GetFieldName(FEventMappings, 'CustInterval');
if (FN1 <> '') then
Event.CustInterval := FieldByName(FN1).AsInteger;
Event.CustomInterval := FieldByName(FN1).AsInteger;
FN1 := GetFieldName(FEventMappings, 'UserField0');
if (FN1 <> '') then
@ -722,8 +729,10 @@ begin
Contact.Company := FieldByName(FN).AsString;
FN := GetFieldName(FContactMappings, 'Job_Position');
if FN = '' then
FN := GetFieldName(FContactMappings, 'Position'); // deprecated
if FN <> '' then
Contact.Position := FieldByName(FN).AsString;
Contact.Job_Position := FieldByName(FN).AsString;
FN := GetFieldName(FContactMappings, 'EMail');
if FN <> '' then
@ -1008,8 +1017,10 @@ begin
Resource.Notes := FieldByName(FN).AsString;
FN := GetFieldName(FResourceMappings, 'ResourceActive');
if FN = '' then
FN := GetFieldName(FResourceMappings, 'Active'); // deprecated
if FN <> '' then
Resource.Active := FieldByName(FN).AsBoolean;
Resource.ResourceActive := FieldByName(FN).AsBoolean;
FN := GetFieldName(FResourceMappings, 'UserField0');
if FN <> '' then
@ -1184,7 +1195,7 @@ begin
if FN = '' then
FN := GetFieldName(FEventMappings, 'AlarmWavPath'); // deprecated
if FN <> '' then
EventsTable.FieldByName(FN).AsString := Event.AlarmWavPath;
EventsTable.FieldByName(FN).AsString := Event.DingPath;
FN := GetFieldName(FEventMappings, 'AllDayEvent');
if FN <> '' then
@ -1195,12 +1206,16 @@ begin
EventsTable.FieldByName(FN).AsBoolean := Event.AlarmSet;
FN := GetFieldName(FEventMappings, 'AlarmAdvance');
if FN = '' then
FN := GetFieldName(FEventMappings, 'AlarmAdv'); // Deprecated
if FN <> '' then
EventsTable.FieldByName(FN).AsInteger := Event.AlarmAdv;
EventsTable.FieldByName(FN).AsInteger := Event.AlarmAdvance;
FN := GetFieldName(FEventMappings, 'AlarmAdvanceType');
if FN = '' then
FN := GetFieldName(FEventMappings, 'AlarmAdvType'); // deprecated
if FN <> '' then
EventsTable.FieldByName(FN).AsInteger := Ord(Event.AlarmAdvType);
EventsTable.FieldByName(FN).AsInteger := Ord(Event.AlarmAdvanceType);
FN := GetFieldName(FEventMappings, 'SnoozeTime');
if FN <> '' then
@ -1215,8 +1230,10 @@ begin
EventsTable.FieldByName(FN).AsDateTime := Event.RepeatRangeEnd;
FN := GetFieldName(FEventMappings, 'CustomInterval');
if FN = '' then
FN := GetFieldName(FEventMappings, 'CustInterval'); // deprecated
if FN <> '' then
EventsTable.FieldByName(FN).AsInteger := Event.CustInterval;
EventsTable.FieldByName(FN).AsInteger := Event.CustomInterval;
FN := GetFieldName(FEventMappings, 'UserField0');
if FN <> '' then
@ -1365,9 +1382,11 @@ begin
if FN <> '' then
ContactsTable.FieldByName(FN).AsString := Contact.Company;
FN := GetFieldName(FContactMappings, 'Position');
FN := GetFieldName(FContactMappings, 'Job_Position');
if FN = '' then
FN := GetFieldName(FContactMappings, 'Position'); // deprecated
if FN <> '' then
ContactsTable.FieldByName(FN).AsString := Contact.Position;
ContactsTable.FieldByName(FN).AsString := Contact.Job_Position;
FN := GetFieldName(FContactMappings, 'EMail');
if FN <> '' then
@ -1743,8 +1762,10 @@ begin
FieldByName(FN).AsString := Res.Notes;
FN := GetFieldName(FResourceMappings, 'ResourceActive');
if FN = '' then
FN := GetFieldName(FResourceMappings, 'Active'); // deprecated
if FN <> '' then
FieldByName(FN).AsBoolean := Res.Active;
FieldByName(FN).AsBoolean := Res.ResourceActive;
FN := GetFieldName(FResourceMappings, 'UserField0');
if FN <> '' then

25
components/tvplanit/source/vpflxdsed1.pas
View File

@ -349,21 +349,22 @@ begin
MC := FlexDS.EventMappings;
EventsDS.FieldDefs.GetItemNames(DataSetFieldLB.Items);
VpFieldLB.Items.Add('RecordID');
VpFieldLB.Items.Add('ResourceID');
VpFieldLB.Items.Add('StartTime');
VpFieldLB.Items.Add('EndTime');
VpFieldLB.Items.Add('ResourceID');
VpFieldLB.Items.Add('Description');
VpFieldLB.Items.Add('Note');
VpFieldLB.Items.Add('Location');
VpFieldLB.Items.Add('Notes');
VpFieldLB.Items.Add('Category');
VpFieldLB.Items.Add('AllDayEvent');
VpFieldLB.Items.Add('AlarmWavPath');
VpFieldLB.Items.Add('DingPath');
VpFieldLB.Items.Add('AlarmSet');
VpFieldLB.Items.Add('AlarmAdv');
VpFieldLB.Items.Add('AlarmAdvType');
VpFieldLB.Items.Add('AlarmAdvance');
VpFieldLB.Items.Add('AlarmAdvanceType');
VpFieldLB.Items.Add('SnoozeTime');
VpFieldLB.Items.Add('RepeatCode');
VpFieldLB.Items.Add('RepeatRangeEnd');
VpFieldLB.Items.Add('CustInterval');
VpFieldLB.Items.Add('CustomInterval');
VpFieldLB.Items.Add('UserField0');
VpFieldLB.Items.Add('UserField1');
VpFieldLB.Items.Add('UserField2');
@ -379,22 +380,21 @@ begin
else if DatasetCombo.Text = ContactsTableName then begin
MC := FlexDS.ContactMappings;
ContactsDS.FieldDefs.GetItemNames(DataSetFieldLB.Items);
VpFieldLB.Items.Add('ResourceID');
VpFieldLB.Items.Add('RecordID');
VpFieldLB.Items.Add('ResourceID');
VpFieldLB.Items.Add('FirstName');
VpFieldLB.Items.Add('LastName');
VpFieldLB.Items.Add('Birthdate');
VpFieldLB.Items.Add('Anniversary');
VpFieldLB.Items.Add('Title');
VpFieldLB.Items.Add('Company');
VpFieldLB.Items.Add('Position');
VpFieldLB.Items.Add('EMail');
VpFieldLB.Items.Add('Job_Position');
VpFieldLB.Items.Add('Address');
VpFieldLB.Items.Add('City');
VpFieldLB.Items.Add('State');
VpFieldLB.Items.Add('Zip');
VpFieldLB.Items.Add('Country');
VpFieldLB.Items.Add('Note');
VpFieldLB.Items.Add('Notes');
VpFieldLB.Items.Add('Phone1');
VpFieldLB.Items.Add('Phone2');
VpFieldLB.Items.Add('Phone3');
@ -406,6 +406,7 @@ begin
VpFieldLB.Items.Add('PhoneType4');
VpFieldLB.Items.Add('PhoneType5');
VpFieldLB.Items.Add('Category');
VpFieldLB.Items.Add('EMail');
VpFieldLB.Items.Add('Custom1');
VpFieldLB.Items.Add('Custom2');
VpFieldLB.Items.Add('Custom3');
@ -425,15 +426,15 @@ begin
else if DatasetCombo.Text = TasksTableName then begin
MC := FlexDS.TaskMappings;
TasksDS.FieldDefs.GetItemNames(DataSetFieldLB.Items);
VpFieldLB.Items.Add('ResourceID');
VpFieldLB.Items.Add('RecordID');
VpFieldLB.Items.Add('ResourceID');
VpFieldLB.Items.Add('Complete');
VpFieldLB.Items.Add('Description');
VpFieldLB.Items.Add('Details');
VpFieldLB.Items.Add('CreatedOn');
VpFieldLB.Items.Add('CompletedOn');
VpFieldLB.Items.Add('Priority');
VpFieldLB.Items.Add('Category');
VpFieldLB.Items.Add('CompletedOn');
VpFieldLB.Items.Add('DueDate');
VpFieldLB.Items.Add('UserField0');
VpFieldLB.Items.Add('UserField1');