Skip to content
This repository has been archived by the owner on Jan 18, 2022. It is now read-only.

Commit

Permalink
dvp -> master
Browse files Browse the repository at this point in the history
1.40 Stable
  • Loading branch information
kevin-briand committed Jun 3, 2017
2 parents 7abf12e + a79a5e6 commit 9c4bb10
Show file tree
Hide file tree
Showing 96 changed files with 6,717 additions and 12,818 deletions.
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,25 @@ Temporary Items
Archives
*.iss
build-AutoBL2-Desktop_Qt_5_0_2_MinGW_32bit-Release
<<<<<<< HEAD
build-AutoBL2-Desktop_Qt_5_1_1_MinGW_32bit-Release
build-AutoBL2-Desktop_Qt_5_7_1_MSVC2015_32bit-Release
build-AutoBL2-Desktop_Qt_5_7_1_MSVC2015_32bit-Debug
=======
build-AutoBL2-Desktop_Qt_5_0_2_MinGW_32bit-Debug
build-AutoBL2-Desktop_Qt_5_7_1_MSVC2015_32bit-Release
>>>>>>> master
licence.txt
*.user
*.95cd6ef
AutoBL/AutoBL2.pro.user
*.user
*.user
AutoBL/AutoBL2.pro.user
<<<<<<< HEAD
Ressources/cryptopp.dll
Test/Esabora/build-Simul_Esabora-Desktop_Qt_5_7_1_MSVC2015_32bit-Release
Test/Esabora/Ressources/*.txt
=======
Output
>>>>>>> master
82 changes: 45 additions & 37 deletions AutoBL/AutoBL2.pro
Original file line number Diff line number Diff line change
@@ -1,37 +1,45 @@
#-------------------------------------------------
#
# Project created by QtCreator 2016-07-15T13:29:56
#
#-------------------------------------------------

QT += core gui
QT += network
QT += webkitwidgets
QT += sql

greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

TARGET = AutoBL
TEMPLATE = app
TRANSLATIONS = AutoBL_fr.ts


SOURCES += main.cpp\
principal.cpp \
rexel.cpp \
esabora.cpp \
tache.cpp \
db.cpp

HEADERS += principal.h \
rexel.h \
esabora.h \
tache.h \
db.h

FORMS += principal.ui

RESOURCES += \
ressources.qrc

DISTFILES +=
#-------------------------------------------------
#
# Project created by QtCreator 2016-07-15T13:29:56
#
#-------------------------------------------------

QT += core gui
QT += network
QT += webenginewidgets
QT += sql

LIBS += User32.Lib

greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

TARGET = AutoBL
TEMPLATE = app
TRANSLATIONS = AutoBL_fr.ts


SOURCES += main.cpp\
principal.cpp \
esabora.cpp \
tache.cpp \
db.cpp \
fournisseur.cpp \
rexelfr.cpp \
fctfournisseur.cpp \
error.cpp

HEADERS += principal.h \
esabora.h \
tache.h \
db.h \
fournisseur.h \
rexelfr.h \
fctfournisseur.h \
error.h

FORMS += principal.ui

RESOURCES += \
ressources.qrc

DISTFILES +=
291 changes: 270 additions & 21 deletions AutoBL/AutoBL2.pro.user

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions AutoBL/MinimalFournisseur/minimalfournisseur.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#include "minimalfournisseur.h"
///Error Code xxx
MinimalFournisseur::MinimalFournisseur(FctFournisseur *fct, const QString login, const QString mdp, const QString lien_Travail, const QString comp):
m_Login(login),m_MDP(mdp),m_UserName(comp),m_WorkLink(lien_Travail)
{
DEBUG << "Init Class FRN";
m_Fct = fct;
}

bool MinimalFournisseur::Start()
{
//Premier démarrage
}

///Error code xxx
QStringList MinimalFournisseur::Get_Invoice(const QString InvoiceNumber)
{

}

void MinimalFournisseur::Set_Var(const QString login, const QString mdp, const QString comp)
{
m_Login = login;
m_MDP = mdp;
m_UserName = comp;
}

bool MinimalFournisseur::Test_Connexion()
{
DEBUG << "TEST CONNEXION FRN";
return ;
}
32 changes: 32 additions & 0 deletions AutoBL/MinimalFournisseur/minimalfournisseur.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#ifndef MINIMALFOURNISSEUR_H
#define MINIMALFOURNISSEUR_H

#include "db.h"
#include "fctfournisseur.h"
#include <QDebug>

#define DEBUG qDebug()

class MinimalFournisseur
{
public:
MinimalFournisseur(FctFournisseur *fct, const QString login, const QString mdp, const QString lien_Travail, const QString comp);
bool Start();
QStringList Get_Invoice(const QString InvoiceNumber);
void Set_Var(const QString login,const QString mdp,const QString comp);
bool Test_Connexion();

private slots:

signals:
void Info(const QString i);
//void Error(const QString error);
void FindTexte(const QString texte);

private:
QString m_Login,m_MDP,m_UserName,m_WorkLink;
FctFournisseur *m_Fct;
DB m_DB;
};

#endif // MINIMALFOURNISSEUR_H
45 changes: 0 additions & 45 deletions AutoBL/cookiejar.cpp

This file was deleted.

19 changes: 0 additions & 19 deletions AutoBL/cookiejar.h

This file was deleted.

Loading

0 comments on commit 9c4bb10

Please sign in to comment.