Subversion Repositories public

Compare Revisions

Ignore whitespace Rev 69 → Rev 70

/tilgungsplan/trunk/src/tilgrech.cpp
839,7 → 839,7
 
dat_par = ragab;
tageber (dat_par);
kap = rahmen;
kap = rahmen + TpPars->kosten;
rat = 0.0;
ab_tag = tg_par;
vorrech ();
1014,8 → 1014,26
else
effend = 0L;
 
/* Spesen dürfen nur einmal bei der Auszahlung auf das Kapital
* aufgeschlagen werden.
*/
if (!TpPars->effekt)
{
DTable.datum = TpPars->ragab;
DTable.kz = 'U'; // Auszahlung
DTable.kapital = kap;
DTable.tilg = 0.0;
DTable.rate = 0.0;
DTable.zinsen = TpPars->kosten;
DTable.rkapi = kap + TpPars->kosten;
kap += TpPars->kosten;
 
write (fd, &DTable, sizeof (DTABLE));
offset += (long)sizeof (DTABLE);
}
 
/* Schleife zur Berechnung der Gesamtbelastung (Dekursiv) */
 
for (i = 0; i < index; i++)
{
#ifdef _ZINSAENDERUNG
1614,6 → 1632,17
zi_rat = 0.0;
zi_kap = 0.0;
dat_par = 0L;
reh = 0;
divisor = 0.0;
a_ind = 0;
r_ind = 0;
max_abs = max_rat = 0;
pos = 0L;
a_dat = 0L;
tg_par = tg_alt = 0L;
r_dat = 0L;
ldat = 0L;
rat = kap = 0.0;
 
for (i = 0; i < 1200; i++)
{
/tilgungsplan/trunk/src/tilgungsplanwidgetbase.ui
51,99 → 51,6
</property>
<widget class="QGroupBox">
<property name="name">
<cstring>groupBox1</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>0</y>
<width>370</width>
<height>110</height>
</rect>
</property>
<property name="title">
<string>Auszahlung</string>
</property>
<widget class="QLabel">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>95</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Auszahlung am</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>90</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Betrag</string>
</property>
</widget>
<widget class="KDoubleNumInput">
<property name="name">
<cstring>kDoubleNumInput_Betrag</cstring>
</property>
<property name="geometry">
<rect>
<x>110</x>
<y>20</y>
<width>120</width>
<height>25</height>
</rect>
</property>
<property name="value">
<number>100000</number>
</property>
<property name="minValue">
<number>1</number>
</property>
<property name="maxValue">
<number>2e+07</number>
</property>
<property name="toolTip" stdset="0">
<string>Kreditbetrag</string>
</property>
</widget>
<widget class="KDateWidget">
<property name="name">
<cstring>kDateWidget_Auszahlung</cstring>
</property>
<property name="geometry">
<rect>
<x>110</x>
<y>50</y>
<width>216</width>
<height>23</height>
</rect>
</property>
<property name="date">
<date>
<year>2008</year>
<month>1</month>
<day>1</day>
</date>
</property>
</widget>
</widget>
<widget class="QGroupBox">
<property name="name">
<cstring>groupBox6</cstring>
</property>
<property name="geometry">
1067,30 → 974,14
<rect>
<x>10</x>
<y>80</y>
<width>65</width>
<width>100</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Fixspesen</string>
<string>Abschlussentg.</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
<cstring>textLabel5</cstring>
</property>
<property name="geometry">
<rect>
<x>240</x>
<y>80</y>
<width>30</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>EUR</string>
</property>
</widget>
<widget class="QComboBox">
<item>
<property name="text">
1173,6 → 1064,22
<number>2e+07</number>
</property>
</widget>
<widget class="QLabel">
<property name="name">
<cstring>textLabel5</cstring>
</property>
<property name="geometry">
<rect>
<x>240</x>
<y>80</y>
<width>30</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>EUR</string>
</property>
</widget>
</widget>
<widget class="QGroupBox">
<property name="name">
1923,11 → 1830,14
</widget>
<widget class="KDoubleNumInput">
<property name="name">
<cstring>kDoubleNumInput_Zinssatz</cstring>
<cstring>kDoubleNumInput_ZiZuschuss</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>110</x>
<x>500</x>
<y>20</y>
<width>120</width>
<height>25</height>
1942,14 → 1852,11
</widget>
<widget class="KDoubleNumInput">
<property name="name">
<cstring>kDoubleNumInput_ZiZuschuss</cstring>
<cstring>kDoubleNumInput_Zinssatz</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>500</x>
<x>110</x>
<y>20</y>
<width>120</width>
<height>25</height>
1963,6 → 1870,163
</property>
</widget>
</widget>
<widget class="QGroupBox">
<property name="name">
<cstring>groupBox1</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>0</y>
<width>370</width>
<height>110</height>
</rect>
</property>
<property name="title">
<string>Auszahlung</string>
</property>
<widget class="QLabel">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>95</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Auszahlung am</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>90</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Betrag</string>
</property>
</widget>
<widget class="KDateWidget">
<property name="name">
<cstring>kDateWidget_Auszahlung</cstring>
</property>
<property name="geometry">
<rect>
<x>110</x>
<y>50</y>
<width>216</width>
<height>23</height>
</rect>
</property>
<property name="date">
<date>
<year>2008</year>
<month>1</month>
<day>1</day>
</date>
</property>
</widget>
<widget class="QLabel">
<property name="name">
<cstring>textLabel1_6</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>80</y>
<width>80</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Fixspesen</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
<cstring>textLabel5_4</cstring>
</property>
<property name="geometry">
<rect>
<x>240</x>
<y>20</y>
<width>30</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>EUR</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
<cstring>textLabel5_5</cstring>
</property>
<property name="geometry">
<rect>
<x>240</x>
<y>80</y>
<width>30</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>EUR</string>
</property>
</widget>
<widget class="KDoubleNumInput">
<property name="name">
<cstring>kDoubleNumInput_Betrag</cstring>
</property>
<property name="geometry">
<rect>
<x>110</x>
<y>20</y>
<width>120</width>
<height>25</height>
</rect>
</property>
<property name="value">
<number>9999</number>
</property>
<property name="minValue">
<number>1</number>
</property>
<property name="maxValue">
<number>2e+07</number>
</property>
<property name="toolTip" stdset="0">
<string>Kreditbetrag</string>
</property>
</widget>
<widget class="KDoubleNumInput">
<property name="name">
<cstring>kDoubleNumInput_Kosten</cstring>
</property>
<property name="geometry">
<rect>
<x>110</x>
<y>80</y>
<width>120</width>
<height>25</height>
</rect>
</property>
<property name="maxValue">
<number>2e+07</number>
</property>
</widget>
</widget>
</widget>
<menubar>
<property name="name">
2648,9 → 2712,16
<receiver>Tilgungsplan</receiver>
<slot>rbZuschFSlot()</slot>
</connection>
<connection>
<sender>kDoubleNumInput_Kosten</sender>
<signal>valueChanged(double)</signal>
<receiver>Tilgungsplan</receiver>
<slot>numKostenSlot()</slot>
</connection>
</connections>
<tabstops>
<tabstop>kDoubleNumInput_Betrag</tabstop>
<tabstop>kDoubleNumInput_Kosten</tabstop>
<tabstop>comboBox_tageber</tabstop>
<tabstop>comboBox_verzart</tabstop>
<tabstop>kDoubleNumInput_Fixspesen</tabstop>
2749,13 → 2820,11
<slot>numSpesenSlot()</slot>
<slot>rbZuschPSlot()</slot>
<slot>rbZuschFSlot()</slot>
<slot>numKostenSlot()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>kdatewidget.h</includehint>
<includehint>kdatewidget.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
2774,5 → 2843,10
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>kdatewidget.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
</includehints>
</UI>
/tilgungsplan/trunk/src/tilgungsplanwidget.cpp
120,6 → 120,7
 
TpPars.zuschver = 0; // wird derzeit nicht verwendet!
TpPars.spesen = kDoubleNumInput_Fixspesen->value();
TpPars.kosten = kDoubleNumInput_Kosten->value();
TpPars.rahmen = kDoubleNumInput_Betrag->value();
TpPars.kapital = 0.0;
TpPars.raplan[0] = checkBox_RaJan->isChecked();
211,6 → 212,7
read (fd, &TpPars, sizeof(TPPARS));
tmpFile.close();
kDoubleNumInput_Betrag->setValue(TpPars.rahmen);
kDoubleNumInput_Kosten->setValue(TpPars.kosten);
date_int(&day, &mon, &year, TpPars.ragab);
dt.setYMD(year, mon, day);
kDateWidget_Auszahlung->setDate(dt);
455,6 → 457,7
pars.ezins = 0.0;
pars.zuschuss = 0.0;
pars.gewicht = 0.0;
pars.kosten = 0.0;
 
if (TpPars.abschlry > 40)
pars.abschlry = 52;
723,6 → 726,11
dirty = TRUE;
}
 
void tilgungsplanWidget::numKostenSlot()
{
dirty = TRUE;
}
 
void tilgungsplanWidget::helpAbout()
{}
 
/tilgungsplan/trunk/src/tilgplan.h
39,7 → 39,8
BOOL ultimo; /* Berechnung auf Ultimo */
int abschlry; /* Abschlußrythmus */
int zuschver; /* Zuschuß Verrechnung */
double spesen; /* Fixspesen */
double spesen; /* Fixspesen --> Abschlussentgelt */
double kosten; /* Fixspesen --> 1 x bei Auszahlung! */
double rahmen; /* Ursprüngliche Rahmen */
double kapital; /* Endkapital */
int raplan[12]; /* Ratenplan */
/tilgungsplan/trunk/src/helper.cpp
38,6 → 38,9
 
void date_int (int *day, int *mon, int *year, long date)
{
if (day == NULL || mon == NULL || year == NULL || date <= 10000L)
return;
 
*year = (int)(date / 10000);
*day = (int)(date % 100);
*mon = (int)((date % 10000) - *day) / 100;
/tilgungsplan/trunk/src/tilgungsplanwidget.h
71,6 → 71,7
virtual void numZiZuschSlot();
virtual void numRateSlot();
virtual void numFixspesenSlot();
virtual void numKostenSlot();
virtual void cbRundenSlot();
virtual void numBetragSlot();
virtual void helpAbout();
/tilgungsplan/trunk/src/ratenplanwidget.cpp
101,6 → 101,7
 
switch (dTable.kz)
{
case 'U': text = QString("Auszahlung"); break;
case 'A': text = QString("Abschluss"); break;
case 'R': text = QString("Rate"); break;
case 'Z': text = QString::fromUtf8("Zinssatzänderung auf %1").arg(dTable.rate, 0, 'f', 3); break;
230,6 → 231,7
 
switch (dTable.kz)
{
case 'U': zeile.append("Auszahlung\t"); break;
case 'A': zeile.append("Abschluss\t"); break;
case 'R': zeile.append("Rate\t"); break;
case 'Z':