[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/office/kraft/src
From: Klaas Freitag <freitag () suse ! de>
Date: 2006-11-30 22:09:14
Message-ID: 1164924554.633576.1760.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 609469 by freitag:
- code cleanups
- material catalog display adopted to catalog base
clases
M +2 -1 Makefile.am
M +1 -0 brunskataloglistview.cpp
M +9 -8 brunskataloglistview.h
M +1 -1 floskeltemplate.cpp
M +1 -1 flostempldialog.cpp
M +1 -1 katalog.cpp
M +1 -5 kataloglistview.cpp
M +0 -1 kataloglistview.h
M +1 -1 matcalcdialog.cpp
A materialkataloglistview.cpp [License: GPL (v2+)]
A materialkataloglistview.h [License: GPL (v2+)]
A materialkatalogview.cpp [License: GPL (v2+)]
A materialkatalogview.h [License: GPL (v2+)]
M +39 -2 matkatalog.cpp
M +10 -6 matkatalog.h
M +16 -18 portal.cpp
M +2 -2 stockmaterial.cpp
M +3 -2 stockmaterial.h
M +1 -1 templatesaverdb.cpp
M +1 -1 templkataloglistview.cpp
M +1 -1 templkatalogview.cpp
--- trunk/playground/office/kraft/src/Makefile.am #609468:609469
@@ -30,7 +30,8 @@
docdigestview.cpp portal.cpp portalview.cpp archiveman.cpp reportgenerator.cpp \
docoverviewwidget.cpp htmlview.cpp docpostcard.cpp catalogselection.cpp \
addressselection.cpp kraftdocheaderedit.cpp kraftdocfooteredit.cpp \
- inserttempldialog.cpp archdocposition.cpp archdoc.cpp defaultprovider.cpp
+ inserttempldialog.cpp archdocposition.cpp archdoc.cpp defaultprovider.cpp \
+ materialkataloglistview.cpp materialkatalogview.cpp
kraft_LDADD = libbruns.la $(LIB_KIO) $(LIB_KABC) -lkhtml
--- trunk/playground/office/kraft/src/brunskataloglistview.cpp #609468:609469
@@ -171,3 +171,4 @@
// FIXME
return pos;
}
+
--- trunk/playground/office/kraft/src/brunskataloglistview.h #609468:609469
@@ -34,19 +34,20 @@
class BrunsKatalogListView : public KatalogListView
{
public:
- typedef enum { Fruits, Rhodos, Roses, Stauden, Konis, Etc } TopKatalogIds;
+ typedef enum { Fruits, Rhodos, Roses, Stauden, Konis, Etc } TopKatalogIds;
- BrunsKatalogListView(QWidget *);
+ BrunsKatalogListView(QWidget *);
- ~BrunsKatalogListView();
- void addCatalogDisplay( const QString& katName );
- BrunsRecord getRecord( QListViewItem * );
- void setupChapters();
+ ~BrunsKatalogListView();
+ void addCatalogDisplay( const QString& katName );
+ BrunsRecord getRecord( QListViewItem * );
+ void setupChapters();
DocPosition itemToDocPosition( QListViewItem *it = 0 );
+ KatalogListView *createListView( QWidget* );
private:
- QMap<QListViewItem*, BrunsRecord> m_itemMap;
- QMap<TopKatalogIds, KListViewItem*> m_topFolderMap;
+ QMap<QListViewItem*, BrunsRecord> m_itemMap;
+ QMap<TopKatalogIds, KListViewItem*> m_topFolderMap;
};
#endif
--- trunk/playground/office/kraft/src/floskeltemplate.cpp #609468:609469
@@ -412,7 +412,7 @@
{
++it;
QDomElement matElem = doc.createElement("Material");
- matElem.appendChild(createDomNode(doc, "MaterialName", mat->getName()));
+ matElem.appendChild(createDomNode(doc, "MaterialName", mat->name()));
QString h;
h = h.setNum(mc->getCalcAmount(mat));
matElem.appendChild(createDomNode(doc, "Amount", h));
--- trunk/playground/office/kraft/src/flostempldialog.cpp #609468:609469
@@ -482,7 +482,7 @@
void FlosTemplDialog::drawMatListEntry( QListViewItem *it, MaterialCalcPart *mc, StockMaterial *mat )
{
- it->setText( 0, mat->getName());
+ it->setText( 0, mat->name());
it->setText( 1, QString::number(mc->getCalcAmount( mat ), 'f',2));
it->setText( 2, mat->getUnit().einheitSingular());
it->setText( 3, mc->getPriceForMaterial(mat).toString());
--- trunk/playground/office/kraft/src/katalog.cpp #609468:609469
@@ -90,7 +90,7 @@
while ( cur.next() )
{
- QString katName = cur.value("chapter").toString();
+ QString katName = QString::fromUtf8( cur.value("chapter").toCString() );
int katID = cur.value("chapterID").toInt();
kdDebug() << "Adding catalog chapter " << katName << " with ID " << katID << endl;
m_chapters.append(katName);
--- trunk/playground/office/kraft/src/kataloglistview.cpp #609468:609469
@@ -165,10 +165,6 @@
}
}
-KatalogListView *KatalogListView::createListView(QWidget*)
-{
- kdDebug() << "ERROR: Reimplement createListView!" << endl;
- return 0;
-}
+
#include "kataloglistview.moc"
--- trunk/playground/office/kraft/src/kataloglistview.h #609468:609469
@@ -46,7 +46,6 @@
bool isRoot(KListViewItem*);
virtual void setupChapters();
- virtual KatalogListView *createListView(QWidget*);
QPopupMenu *contextMenu();
virtual DocPosition itemToDocPosition( QListViewItem *it = 0 ) = 0;
--- trunk/playground/office/kraft/src/matcalcdialog.cpp #609468:609469
@@ -46,7 +46,7 @@
if( ! m_material ) return;
Einheit e = m_material->getUnit();
- matLabel->setText( m_material->getName());
+ matLabel->setText( m_material->name());
einheitLabel->setText( e.einheit(amount) );
}
--- trunk/playground/office/kraft/src/matkatalog.cpp #609468:609469
@@ -1,5 +1,5 @@
/***************************************************************************
- matkatalog -
+ matkatalog - the material catalog
-------------------
begin : 2004-19-10
copyright : (C) 2004 by Klaas Freitag
@@ -41,9 +41,46 @@
int MatKatalog::load()
{
Katalog::load();
- return 0;
+ int cnt = 0;
+
+ QSqlCursor cur( "stockMaterial" ); // Specify the table/view name
+ cur.setMode( QSqlCursor::ReadOnly );
+ cur.select(); // We'll retrieve every record
+ while ( cur.next() ) {
+ cnt++;
+ int id = cur.value( "matID" ).toInt();
+ int chapterID = cur.value( "chapterID" ).toInt();
+ QString material = QString::fromUtf8( cur.value( "material" ).toCString() );
+ int unitID = cur.value( "unitID" ).toInt();
+ double pPack = cur.value( "perPack" ).toDouble();
+ double priceIn = cur.value( "priceIn" ).toDouble();
+ double priceOut = cur.value( "priceOut" ).toDouble();
+
+ mAllMaterial.append( new StockMaterial( id, chapterID, material, unitID,
+ pPack, Geld( priceIn ), Geld( priceOut ) ) );
+ }
+
+ return cnt;
}
+StockMaterialList MatKatalog::getRecordList( const QString& chapter )
+{
+ StockMaterialList list;
+ StockMaterial *mat;
+
+ int chapID = chapterID( chapter );
+
+ for ( mat = mAllMaterial.first(); mat; mat = mAllMaterial.next() ) {
+ if ( mat->chapter() == chapID ) {
+ list.append( mat );
+ }
+ }
+ return list;
+
+}
+
+
+
MatKatalog::~MatKatalog( )
{
--- trunk/playground/office/kraft/src/matkatalog.h #609468:609469
@@ -26,6 +26,7 @@
// include files
#include <qstring.h>
+#include "stockmaterial.h"
#include "katalog.h"
/**
@@ -35,15 +36,18 @@
class MatKatalog : public Katalog
{
public:
- MatKatalog( const QString& name );
- MatKatalog();
- ~MatKatalog();
+ MatKatalog( const QString& name );
+ MatKatalog();
+ ~MatKatalog();
- int getEntriesPerChapter( const QString& = QString() ) { return 0; } // FIXME
+ int getEntriesPerChapter( const QString& = QString() ) { return 0; } // FIXME
- int load();
- KatalogType type() { return MaterialCatalog; }
+ int load();
+ KatalogType type() { return MaterialCatalog; }
+ StockMaterialList getRecordList( const QString& );
+private:
+ StockMaterialList mAllMaterial;
};
#endif
--- trunk/playground/office/kraft/src/portal.cpp #609468:609469
@@ -49,6 +49,7 @@
#include "templkatalogview.h"
#include "mateditor.h"
#include "brunskatalogview.h"
+#include "materialkatalogview.h"
#include "prefsdialog.h"
#include "documentman.h"
#include "docdigestview.h"
@@ -436,26 +437,23 @@
// FIXME: Besser Unterscheidung der Kataloge
if( kat == QString("Material") ) {
- /* Materialkatalog */
- MatEditor me("Material Allgemein", false, this);
- QApplication::restoreOverrideCursor();
-
- if ( me.exec() == QDialog::Accepted ) {
- kdDebug() << "fine" << endl;
- }
+ /* Materialkatalog */
+ MaterialKatalogView *katView = new MaterialKatalogView();
+ katView->init( kat );
+ katView->show();
} else if( kat.startsWith("Bruns") ) {
- // BrunsKatalog *brunskat = new BrunsKatalog();
- // brunskat->load();
- BrunsKatalogView *katView = new BrunsKatalogView();
- katView->init(kat);
- katView->show();
+ // BrunsKatalog *brunskat = new BrunsKatalog();
+ // brunskat->load();
+ BrunsKatalogView *katView = new BrunsKatalogView();
+ katView->init(kat);
+ katView->show();
} else {
- /* normaler Vorlagenkatalog */
- TemplKatalogView *katView = new TemplKatalogView();
- connect( katView, SIGNAL( newDocPosition( const DocPosition& ) ),
- this, SLOT( slotOfferNewPosition( const DocPosition& ) ) );
- katView->init(kat);
- katView->show();
+ /* normaler Vorlagenkatalog */
+ TemplKatalogView *katView = new TemplKatalogView();
+ connect( katView, SIGNAL( newDocPosition( const DocPosition& ) ),
+ this, SLOT( slotOfferNewPosition( const DocPosition& ) ) );
+ katView->init(kat);
+ katView->show();
}
QApplication::restoreOverrideCursor();
}
--- trunk/playground/office/kraft/src/stockmaterial.cpp #609468:609469
@@ -48,12 +48,12 @@
}
-QString StockMaterial::getName() const
+QString StockMaterial::name() const
{
return m_name;
}
-QString StockMaterial::getDescription() const
+QString StockMaterial::description() const
{
return m_descr;
}
--- trunk/playground/office/kraft/src/stockmaterial.h #609468:609469
@@ -43,8 +43,8 @@
double perPack, Geld pIn, Geld pOut );
~StockMaterial();
- QString getName() const;
- QString getDescription() const;
+ QString name() const;
+ QString description() const;
double getAmountPerPack();
void setAmountPerPack( double am );
@@ -55,6 +55,7 @@
int getID();
void setID( int );
+ int chapter() { return m_chapter; }
KABC::Addressee getSupplier();
void setSupplier( KABC::Addressee *supp );
--- trunk/playground/office/kraft/src/templatesaverdb.cpp #609468:609469
@@ -292,7 +292,7 @@
void TemplateSaverDB::storeMaterialDetail( MaterialCalcPart *cp, StockMaterial *mat )
{
if( ! (cp && mat) ) return;
- kdDebug() << "storing material calcpart detail for material " << mat->getName() << endl;
+ kdDebug() << "storing material calcpart detail for material " << mat->name() << endl;
/* create temporar dbcalcpart and fill the current material list */
QSqlCursor cur("CalcMaterialDetails");
--- trunk/playground/office/kraft/src/templkataloglistview.cpp #609468:609469
@@ -183,7 +183,7 @@
{
++it;
Geld g = mcp->getPriceForMaterial(mat);
- QString t = mat->getName();
+ QString t = mat->name();
double usedAmount = mcp->getCalcAmount(mat);
t += i18n(", Amount: %L1 ").arg( usedAmount);
Einheit e = mat->getUnit();
--- trunk/playground/office/kraft/src/templkatalogview.cpp #609468:609469
@@ -227,7 +227,7 @@
void TemplKatalogView::createCentralWidget(QBoxLayout*box, QWidget *w)
{
kdDebug() << "Creating new Listview" << endl;
- m_listview = new TemplKatalogListView(w);
+ m_listview = new TemplKatalogListView( w );
box->addWidget(m_listview);
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic